Refactor Android configuration

apollographql · Mar 6, 2024 · 5d647d3 · 5d647d3
1 parent c91399a
commit 5d647d3
Show file tree

Hide file tree

Showing 38 changed files with 106 additions and 129 deletions.
diff --git a/build-logic/src/main/kotlin/Android.kt b/build-logic/src/main/kotlin/Android.kt
@@ -0,0 +1,33 @@
+import com.android.build.api.dsl.CommonExtension
+import org.gradle.api.Project
+
+fun Project.configureAndroid(
+    namespace: String,
+    androidOptions: AndroidOptions
+) {
+  plugins.apply("com.android.library")
+  extensions.findByName("android")?.apply {
+    this as CommonExtension<*, *, *, *, *>
+
+    compileSdk = getCatalogVersion("android.sdkversion.compile").toInt()
+    this.namespace = namespace
+
+    defaultConfig {
+      minSdk = if (androidOptions.withCompose) {
+        getCatalogVersion("android.sdkversion.min").toInt()
+      } else {
+        getCatalogVersion("android.sdkversion.compose.min").toInt()
+      }
+    }
+
+    if (androidOptions.withCompose) {
+      buildFeatures {
+        compose = true
+      }
+
+      composeOptions {
+        kotlinCompilerExtensionVersion = getCatalogVersion("compose.compiler")
+      }
+    }
+  }
+}
diff --git a/build-logic/src/main/kotlin/api.kt b/build-logic/src/main/kotlin/api.kt
@@ -8,19 +8,27 @@ import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension
 import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin
 import org.jetbrains.kotlin.gradle.targets.js.npm.tasks.KotlinNpmInstallTask
 
+class AndroidOptions(
+    val withCompose: Boolean
+)
+
 fun Project.apolloLibrary(
-    javaModuleName: String?,
+    namespace: String,
     jvmTarget: Int? = null,
     withJs: Boolean = true,
     withLinux: Boolean = true,
     withApple: Boolean = true,
     withJvm: Boolean = true,
     withWasm: Boolean = true,
+    androidOptions: AndroidOptions? = null,
     publish: Boolean = true
 ) {
   group = property("GROUP")!!
   version = property("VERSION_NAME")!!
 
+  if (androidOptions != null) {
+    configureAndroid(namespace, androidOptions)
+  }
   commonSetup()
   configureJavaAndKotlinCompilers(jvmTarget)
 
@@ -54,11 +62,9 @@ fun Project.apolloLibrary(
     )
   }
 
-  if (javaModuleName != null) {
-    tasks.withType(Jar::class.java).configureEach {
-      manifest {
-        attributes(mapOf("Automatic-Module-Name" to javaModuleName))
-      }
+  tasks.withType(Jar::class.java).configureEach {
+    manifest {
+      attributes(mapOf("Automatic-Module-Name" to namespace))
     }
   }
 }

diff --git a/build-logic/src/main/kotlin/utils.kt b/build-logic/src/main/kotlin/utils.kt
@@ -0,0 +1,6 @@
+import org.gradle.api.Project
+import org.gradle.api.artifacts.VersionCatalogsExtension
+
+fun Project.getCatalogVersion(alias: String): String {
+  return extensions.findByType(VersionCatalogsExtension::class.java)!!.named("libs").findVersion(alias).get().displayName
+}
diff --git a/gradle/libraries.toml b/gradle/libraries.toml
@@ -55,6 +55,7 @@ androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version
 androidx-espresso-idlingresource = { group = "androidx.test.espresso", name = "espresso-idling-resource", version = "3.5.1" }
 androidx-lint-rules = "androidx.lint:lint-gradle:1.0.0-alpha01"
 androidx-lint-gradle-plugin = "com.android.lint:com.android.lint.gradle.plugin:8.2.2"
+androidx-paging-compose = "androidx.paging:paging-compose:1.0.0-alpha18"
 androidx-profileinstaller = "androidx.profileinstaller:profileinstaller:1.3.1"
 androidx-sqlite = { group = "androidx.sqlite", name = "sqlite", version.ref = "androidx-sqlite" }
 androidx-sqlite-framework = { group = "androidx.sqlite", name = "sqlite-framework", version.ref = "androidx-sqlite" }

diff --git a/libraries/apollo-adapters/build.gradle.kts b/libraries/apollo-adapters/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
 }
 
 apolloLibrary(
-    javaModuleName = "com.apollographql.apollo3.adapter",
+    namespace = "com.apollographql.apollo3.adapter",
     withLinux = false,
     withWasm = false
 )

diff --git a/libraries/apollo-annotations/build.gradle.kts b/libraries/apollo-annotations/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
 }
 
 apolloLibrary(
-    javaModuleName = "com.apollographql.apollo3.annotations"
+    namespace = "com.apollographql.apollo3.annotations"
 )
 
 kotlin {

diff --git a/libraries/apollo-api-java/build.gradle.kts b/libraries/apollo-api-java/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
 }
 
 apolloLibrary(
-    javaModuleName = "com.apollographql.apollo3.api.java"
+    namespace = "com.apollographql.apollo3.api.java"
 )
 
 dependencies {

diff --git a/libraries/apollo-api/build.gradle.kts b/libraries/apollo-api/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
 }
 
 apolloLibrary(
-    javaModuleName = "com.apollographql.apollo3.api"
+    namespace = "com.apollographql.apollo3.api"
 )
 
 kotlin {

diff --git a/libraries/apollo-ast/build.gradle.kts b/libraries/apollo-ast/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
 }
 
 apolloLibrary(
-  javaModuleName = "com.apollographql.apollo3.ast"
+  namespace = "com.apollographql.apollo3.ast"
 )
 
 kotlin {

diff --git a/libraries/apollo-cli-incubating/build.gradle.kts b/libraries/apollo-cli-incubating/build.gradle.kts
@@ -4,7 +4,7 @@ plugins {
 }
 
 apolloLibrary(
-    javaModuleName = "com.apollographql.apollo3.cli",
+    namespace = "com.apollographql.apollo3.cli",
 )
 
 dependencies {

diff --git a/libraries/apollo-compiler/build.gradle.kts b/libraries/apollo-compiler/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
 }
 
 apolloLibrary(
-    javaModuleName = "com.apollographql.apollo3.compiler"
+    namespace = "com.apollographql.apollo3.compiler"
 )
 
 dependencies {

diff --git a/libraries/apollo-compose-paging-support-incubating/build.gradle.kts b/libraries/apollo-compose-paging-support-incubating/build.gradle.kts
@@ -1,42 +1,26 @@
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
 plugins {
   id("com.android.library")
-  id("org.jetbrains.kotlin.android")
 }
 
 apolloLibrary(
-    javaModuleName = "com.apollographql.apollo3.compose.paging"
+    namespace = "com.apollographql.apollo3.compose.paging",
+    androidOptions = AndroidOptions(
+        withCompose = true
+    )
 )
 
-
 dependencies {
   api(project(":apollo-compose-support-incubating"))
-  api("androidx.paging:paging-compose:1.0.0-alpha18")
+  api(libs.androidx.paging.compose)
 }
 
-android {
-  compileSdk = libs.versions.android.sdkversion.compile.get().toInt()
-  namespace = "com.apollographql.apollo3.compose.paging.support"
-
-  defaultConfig {
-    minSdk = libs.versions.android.sdkversion.compose.min.get().toInt()
-  }
-
-  buildFeatures {
-    compose = true
-  }
-
-  composeOptions {
-    kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()
-  }
-
-  // TODO: compiling fails only with the debug variant currently, due to using a version of Kotlin non supported by Compose.
-  // For now, disabling the debug variant works around the issue.
-  variantFilter {
-    ignore = name == "debug"
-  }
-}
+//android {
+//  // TODO: compiling fails only with the debug variant currently, due to using a version of Kotlin non supported by Compose.
+//  // For now, disabling the debug variant works around the issue.
+//  variantFilter {
+//    ignore = name == "debug"
+//  }
+//}
 
 // Uncomment when using a non supported version of Kotlin
 // See https://developer.android.com/jetpack/androidx/releases/compose-kotlin

diff --git a/libraries/apollo-compose-support-incubating/build.gradle.kts b/libraries/apollo-compose-support-incubating/build.gradle.kts
@@ -1,12 +1,11 @@
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
 plugins {
   id("com.android.library")
   id("org.jetbrains.kotlin.android")
 }
 
 apolloLibrary(
-    javaModuleName = "com.apollographql.apollo3.compose"
+    namespace = "com.apollographql.apollo3.compose",
+    androidOptions = AndroidOptions(withCompose = true)
 )
 
 dependencies {
@@ -15,23 +14,6 @@ dependencies {
   api(project(":apollo-normalized-cache"))
 }
 
-android {
-  compileSdk = libs.versions.android.sdkversion.compile.get().toInt()
-  namespace = "com.apollographql.apollo3.compose.support"
-
-  defaultConfig {
-    minSdk = libs.versions.android.sdkversion.compose.min.get().toInt()
-  }
-
-  buildFeatures {
-    compose = true
-  }
-
-  composeOptions {
-    kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()
-  }
-}
-
 // Uncomment when using a non supported version of Kotlin
 // See https://developer.android.com/jetpack/androidx/releases/compose-kotlin
 //tasks.withType(KotlinCompile::class.java).configureEach {

diff --git a/libraries/apollo-debug-server/build.gradle.kts b/libraries/apollo-debug-server/build.gradle.kts
@@ -5,17 +5,17 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
   id("org.jetbrains.kotlin.multiplatform")
-  id("com.android.library")
   alias(libs.plugins.apollo.published)
   id("com.google.devtools.ksp")
 }
 
 apolloLibrary(
-    javaModuleName = "com.apollographql.apollo3.debugserver",
+    namespace = "com.apollographql.apollo3.debugserver",
     withLinux = false,
     withApple = false,
     withJs = false,
-    withWasm = false
+    withWasm = false,
+    androidOptions = AndroidOptions(withCompose = false)
 )
 
 kotlin {
@@ -74,15 +74,6 @@ configurations.all {
 }
 configurations.getByName(kotlin.sourceSets.getByName("commonMain").compileOnlyConfigurationName).extendsFrom(shadow)
 
-android {
-  compileSdk = libs.versions.android.sdkversion.compile.get().toInt()
-  namespace = "com.apollographql.apollo3.debugserver"
-
-  defaultConfig {
-    minSdk = libs.versions.android.sdkversion.min.get().toInt()
-  }
-}
-
 /**
  * KSP configuration
  * KMP support isn't great so we wire most of the things manually

diff --git a/libraries/apollo-engine-ktor/build.gradle.kts b/libraries/apollo-engine-ktor/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
 }
 
 apolloLibrary(
-    javaModuleName = "com.apollographql.apollo3.engine.ktor",
+    namespace = "com.apollographql.apollo3.engine.ktor",
     withLinux = false,
     withWasm = false
 )

diff --git a/libraries/apollo-execution-incubating/build.gradle.kts b/libraries/apollo-execution-incubating/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
 }
 
 apolloLibrary(
-    javaModuleName = "com.apollographql.apollo3.execution",
+    namespace = "com.apollographql.apollo3.execution",
     publish = false,
 )
 

diff --git a/libraries/apollo-gradle-plugin-external/build.gradle.kts b/libraries/apollo-gradle-plugin-external/build.gradle.kts
@@ -7,7 +7,7 @@ plugins {
 }
 
 apolloLibrary(
-    javaModuleName = "com.apollographql.apollo3.gradle",
+    namespace = "com.apollographql.apollo3.gradle",
     jvmTarget = 11 // AGP requires 11
 )
 

diff --git a/libraries/apollo-gradle-plugin/build.gradle.kts b/libraries/apollo-gradle-plugin/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
 }
 
 apolloLibrary(
-    javaModuleName = null,
+    namespace = "com.apollographql.apollo3.gradle.relocated",
     jvmTarget = 11 // AGP requires 11
 )
 

diff --git a/libraries/apollo-http-cache/build.gradle.kts b/libraries/apollo-http-cache/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
 }
 
 apolloLibrary(
-  javaModuleName = "com.apollographql.apollo3.cache.http"
+  namespace = "com.apollographql.apollo3.cache.http"
 )
 
 dependencies {

diff --git a/libraries/apollo-idling-resource/build.gradle.kts b/libraries/apollo-idling-resource/build.gradle.kts
@@ -4,19 +4,11 @@ plugins {
 }
 
 apolloLibrary(
-    javaModuleName = "com.apollographql.apollo3.idling.resource",
+    namespace = "com.apollographql.apollo3.idling.resource",
+    androidOptions = AndroidOptions(withCompose = false)
 )
 
 dependencies {
   implementation(libs.androidx.espresso.idlingresource)
   api(project(":apollo-runtime"))
 }
-
-android {
-  compileSdk = libs.versions.android.sdkversion.compile.get().toInt()
-  namespace = "com.apollographql.apollo3.idling.resource"
-
-  defaultConfig {
-    minSdk = libs.versions.android.sdkversion.min.get().toInt()
-  }
-}
diff --git a/libraries/apollo-ksp-incubating/build.gradle.kts b/libraries/apollo-ksp-incubating/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
 }
 
 apolloLibrary(
-  javaModuleName = "com.apollographql.apollo3.ksp",
+  namespace = "com.apollographql.apollo3.ksp",
     publish = false,
 )
 

diff --git a/libraries/apollo-mockserver/build.gradle.kts b/libraries/apollo-mockserver/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
 }
 
 apolloLibrary(
-    javaModuleName = "com.apollographql.apollo3.mockserver",
+    namespace = "com.apollographql.apollo3.mockserver",
     withLinux = false,
 )
 

diff --git a/libraries/apollo-mpp-utils/build.gradle.kts b/libraries/apollo-mpp-utils/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
 }
 
 apolloLibrary(
-    javaModuleName = "com.apollographql.apollo3.mpp",
+    namespace = "com.apollographql.apollo3.mpp",
     withLinux = false
 )
 

diff --git a/libraries/apollo-normalized-cache-api-incubating/build.gradle.kts b/libraries/apollo-normalized-cache-api-incubating/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
 }
 
 apolloLibrary(
-  javaModuleName = "com.apollographql.apollo3.cache.normalized.api",
+  namespace = "com.apollographql.apollo3.cache.normalized.api",
     withLinux = false,
 )