upgrade targetSDK and gradle versions

jaeopt · jaeopt · commit ca86f4ee0e58 · 2025-10-29T10:47:28.000-07:00
diff --git a/android-sdk/build.gradle b/android-sdk/build.gradle
@@ -20,7 +20,7 @@ apply plugin: 'kotlin-android'
 android {
     namespace "com.optimizely.ab.android.sdk"
     compileSdk compile_sdk_version
-    buildTools build_tools_version
+    buildToolsVersion build_tools_version
 
     defaultConfig {
         minSdkVersion min_sdk_version
@@ -33,6 +33,10 @@ android {
         // these rules will be merged to app's proguard rules
         consumerProguardFiles '../proguard-rules.txt'
     }
+
+    buildFeatures {
+        buildConfig true
+    }
     testOptions {
         unitTests.returnDefaultValues = true
         unitTests.all {
@@ -53,11 +57,6 @@ android {
             testCoverageEnabled true
         }
     }
-
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_17
-    }
 }
 
 repositories {
diff --git a/build.gradle b/build.gradle
@@ -30,7 +30,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.1.2'
+        classpath 'com.android.tools.build:gradle:8.6.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong
@@ -43,6 +43,19 @@ plugins {
     id 'io.github.gradle-nexus.publish-plugin' version '2.0.0'
 }
 
+subprojects {
+    tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
+        kotlinOptions {
+            jvmTarget = "17"
+        }
+    }
+
+    tasks.withType(JavaCompile).configureEach {
+        sourceCompatibility = "17"
+        targetCompatibility = "17"
+    }
+}
+
 allprojects {
     tasks.withType(Test).configureEach {
         maxParallelForks = Runtime.runtime.availableProcessors().intdiv(2) ?: 1
@@ -209,7 +222,7 @@ configure(publishedProjects) {
 
     android.libraryVariants.all { variant ->
         task("${variant.name}JavadocJar", type: Jar, dependsOn: "${variant.name}Javadoc") {
-            classifier = 'javadoc'
+            archiveClassifier = 'javadoc'
             from tasks["${variant.name}Javadoc"].destinationDir
         }
 
@@ -219,7 +232,7 @@ configure(publishedProjects) {
 
     android.libraryVariants.all { variant ->
         task("${variant.name}SourcesJar", type: Jar) {
-            classifier = 'sources'
+            archiveClassifier = 'sources'
             from variant.javaCompileProvider.get().source
         }
         project.artifacts.add("archives", tasks["${variant.name}SourcesJar"]);
diff --git a/datafile-handler/build.gradle b/datafile-handler/build.gradle
@@ -20,7 +20,7 @@ apply plugin: 'kotlin-android'
 android {
     namespace "com.optimizely.ab.android.datafile_handler"
     compileSdk compile_sdk_version
-    buildTools build_tools_version
+    buildToolsVersion build_tools_version
 
     defaultConfig {
         minSdkVersion min_sdk_version
@@ -39,10 +39,6 @@ android {
             testCoverageEnabled true
         }
     }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_17
-    }
 }
 
 dependencies {
diff --git a/event-handler/build.gradle b/event-handler/build.gradle
@@ -20,7 +20,7 @@ apply plugin: 'kotlin-android'
 android {
     namespace "com.optimizely.ab.android.event_handler"
     compileSdk compile_sdk_version
-    buildTools build_tools_version
+    buildToolsVersion build_tools_version
 
     defaultConfig {
         minSdkVersion min_sdk_version
@@ -44,10 +44,6 @@ android {
             testCoverageEnabled true
         }
     }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_17
-    }
     buildToolsVersion build_tools_version
 }
 
diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,3 @@
 android.enableJetifier=true
 android.useAndroidX=true
 org.gradle.jvmargs=-Xmx1g
-android.disableAutomaticComponentCreation=true
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -4,4 +4,4 @@ distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 org.gradle.jvmargs=-Xmx1g
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
diff --git a/odp/build.gradle b/odp/build.gradle
@@ -21,7 +21,7 @@ apply plugin: 'org.jlleitschuh.gradle.ktlint'
 android {
     namespace "com.optimizely.ab.android.odp"
     compileSdk compile_sdk_version
-    buildTools build_tools_version
+    buildToolsVersion build_tools_version
 
     defaultConfig {
         minSdkVersion min_sdk_version
@@ -42,15 +42,7 @@ android {
             testCoverageEnabled true
         }
     }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_17
-    }
     buildToolsVersion build_tools_version
-
-    kotlinOptions {
-        jvmTarget = '1.8'
-    }
 }
 
 dependencies {
diff --git a/shared/build.gradle b/shared/build.gradle
@@ -20,7 +20,7 @@ apply plugin: 'kotlin-android'
 android {
     namespace "com.optimizely.ab.android.shared"
     compileSdk compile_sdk_version
-    buildTools build_tools_version
+    buildToolsVersion build_tools_version
 
     defaultConfig {
         minSdkVersion min_sdk_version
@@ -41,10 +41,6 @@ android {
             testCoverageEnabled true
         }
     }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_17
-    }
     buildToolsVersion build_tools_version
 }
 
diff --git a/test-app/build.gradle b/test-app/build.gradle
@@ -2,6 +2,7 @@ apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 
 android {
+    namespace "com.optimizely.ab.android.test_app"
     compileSdkVersion compile_sdk_version
     buildToolsVersion build_tools_version
 
@@ -29,10 +30,6 @@ android {
             signingConfig signingConfigs.debug
         }
     }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_17
-    }
     packagingOptions {
         resources {
             excludes += ['META-INF/LICENSE.txt', 'META-INF/NOTICE.txt', 'META-INF/LICENSE', 'META-INF/NOTICE']
diff --git a/user-profile/build.gradle b/user-profile/build.gradle
@@ -20,7 +20,7 @@ apply plugin: 'kotlin-android'
 android {
     namespace "com.optimizely.ab.android.user_profile"
     compileSdk compile_sdk_version
-    buildTools build_tools_version
+    buildToolsVersion build_tools_version
 
     defaultConfig {
         minSdkVersion min_sdk_version
@@ -39,10 +39,6 @@ android {
             testCoverageEnabled true
         }
     }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_17
-    }
 }
 
 dependencies {

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ apply plugin: 'kotlin-android'`
`20`	`20`	`android {`
`21`	`21`	`namespace "com.optimizely.ab.android.datafile_handler"`
`22`	`22`	`compileSdk compile_sdk_version`
`23`		`- buildTools build_tools_version`
	`23`	`+ buildToolsVersion build_tools_version`
`24`	`24`
`25`	`25`	`defaultConfig {`
`26`	`26`	`minSdkVersion min_sdk_version`
`@@ -39,10 +39,6 @@ android {`
`39`	`39`	`testCoverageEnabled true`
`40`	`40`	`}`
`41`	`41`	`}`
`42`		`- compileOptions {`
`43`		`- sourceCompatibility JavaVersion.VERSION_17`
`44`		`- targetCompatibility JavaVersion.VERSION_17`
`45`		`- }`
`46`	`42`	`}`
`47`	`43`
`48`	`44`	`dependencies {`