refactor(distribution): Move DistributionOptions to SentryOptions to resolve circular dependency

- Move DistributionOptions from SentryAndroidOptions to SentryOptions to resolve circular dependency between sentry-android-core and sentry-android-distribution modules
- Simplify DistributionIntegration.register() to work with SentryOptions directly instead of requiring SentryAndroidOptions
- Remove separate DistributionOptions.kt file
- Update API dumps

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <noreply@anthropic.com>

Author: runningcode

sentry-android-distribution/api/sentry-android-distribution.api

@@ -3,22 +3,6 @@ public final class io/sentry/android/distribution/DistributionIntegration : io/s
 	public fun checkForUpdate (Lio/sentry/IDistributionApi$UpdateCallback;)V
 	public fun checkForUpdateBlocking ()Lio/sentry/UpdateStatus;
 	public fun downloadUpdate (Lio/sentry/UpdateInfo;)V
-	public final fun init ()V
-	public final fun init (Lkotlin/jvm/functions/Function1;)V
 	public fun register (Lio/sentry/IScopes;Lio/sentry/SentryOptions;)V
 }
 
-public final class io/sentry/android/distribution/DistributionOptions {
-	public fun <init> ()V
-	public final fun getBuildConfiguration ()Ljava/lang/String;
-	public final fun getOrgAuthToken ()Ljava/lang/String;
-	public final fun getOrgSlug ()Ljava/lang/String;
-	public final fun getProjectSlug ()Ljava/lang/String;
-	public final fun getSentryBaseUrl ()Ljava/lang/String;
-	public final fun setBuildConfiguration (Ljava/lang/String;)V
-	public final fun setOrgAuthToken (Ljava/lang/String;)V
-	public final fun setOrgSlug (Ljava/lang/String;)V
-	public final fun setProjectSlug (Ljava/lang/String;)V
-	public final fun setSentryBaseUrl (Ljava/lang/String;)V
-}
-

sentry-android-distribution/src/main/java/io/sentry/android/distribution/DistributionIntegration.kt

@@ -32,32 +32,6 @@ public class DistributionIntegration(context: Context) : Integration, IDistribut
     // Store scopes and options for use by distribution functionality
     this.scopes = scopes
     this.sentryOptions = options
-    // Distribution integration is registered but initialization still requires manual call to
-    // init()
-    // This allows the integration to be discovered by Sentry's auto-discovery mechanism
-    // while maintaining explicit control over when distribution functionality is enabled
-  }
-
-  /**
-   * Initialize build distribution with default options. This should be called once per process,
-   * typically in Application.onCreate().
-   *
-   * @param context Android context
-   */
-  public fun init() {
-    init {}
-  }
-
-  /**
-   * Initialize build distribution with the provided configuration. This should be called once per
-   * process, typically in Application.onCreate().
-   *
-   * @param context Android context
-   * @param configuration Configuration handler for build distribution options
-   */
-  public fun init(configuration: (DistributionOptions) -> Unit) {
-    val options = DistributionOptions()
-    configuration(options)
   }
 
   /**

sentry-android-distribution/src/main/java/io/sentry/android/distribution/DistributionOptions.kt

@@ -3323,6 +3323,7 @@ public class io/sentry/SentryOptions {
 	public fun getDiagnosticLevel ()Lio/sentry/SentryLevel;
 	public fun getDist ()Ljava/lang/String;
 	public fun getDistinctId ()Ljava/lang/String;
+	public fun getDistribution ()Lio/sentry/SentryOptions$DistributionOptions;
 	public fun getDistributionController ()Lio/sentry/IDistributionApi;
 	public fun getDsn ()Ljava/lang/String;
 	public fun getEnvelopeDiskCache ()Lio/sentry/cache/IEnvelopeCache;
@@ -3458,6 +3459,7 @@ public class io/sentry/SentryOptions {
 	public fun setDiagnosticLevel (Lio/sentry/SentryLevel;)V
 	public fun setDist (Ljava/lang/String;)V
 	public fun setDistinctId (Ljava/lang/String;)V
+	public fun setDistribution (Lio/sentry/SentryOptions$DistributionOptions;)V
 	public fun setDistributionController (Lio/sentry/IDistributionApi;)V
 	public fun setDsn (Ljava/lang/String;)V
 	public fun setEnableAppStartProfiling (Z)V
@@ -3587,6 +3589,15 @@ public final class io/sentry/SentryOptions$Cron {
 	public fun setDefaultTimezone (Ljava/lang/String;)V
 }
 
+public final class io/sentry/SentryOptions$DistributionOptions {
+	public field buildConfiguration Ljava/lang/String;
+	public field orgAuthToken Ljava/lang/String;
+	public field orgSlug Ljava/lang/String;
+	public field projectSlug Ljava/lang/String;
+	public field sentryBaseUrl Ljava/lang/String;
+	public fun <init> ()V
+}
+
 public final class io/sentry/SentryOptions$Logs {
 	public fun <init> ()V
 	public fun getBeforeSend ()Lio/sentry/SentryOptions$Logs$BeforeSendLogCallback;

sentry/api/sentry.api

@@ -597,6 +597,30 @@ public class SentryOptions {
 
   private @NotNull ISocketTagger socketTagger = NoOpSocketTagger.getInstance();
 
+  /**
+   * Configuration options for Sentry Build Distribution. NOTE: Ideally this would be in
+   * SentryAndroidOptions, but there's a circular dependency issue between sentry-android-core and
+   * sentry-android-distribution modules.
+   */
+  public static final class DistributionOptions {
+    /** Organization authentication token for API access */
+    public String orgAuthToken = "";
+
+    /** Sentry organization slug */
+    public String orgSlug = "";
+
+    /** Sentry project slug */
+    public String projectSlug = "";
+
+    /** Base URL for Sentry API (defaults to https://sentry.io) */
+    public String sentryBaseUrl = "https://sentry.io";
+
+    /** Optional build configuration name for filtering (e.g., "debug", "release", "staging") */
+    public @Nullable String buildConfiguration = null;
+  }
+
+  private @NotNull DistributionOptions distribution = new DistributionOptions();
+
   /**
    * Adds an event processor
    *
@@ -3543,6 +3567,14 @@ public interface BeforeSendLogCallback {
     }
   }
 
+  public @NotNull DistributionOptions getDistribution() {
+    return distribution;
+  }
+
+  public void setDistribution(final @NotNull DistributionOptions distribution) {
+    this.distribution = distribution != null ? distribution : new DistributionOptions();
+  }
+
   public enum RequestSize {
     NONE,
     SMALL,