Bump AGP to 8.2.2

warting · Jan 26, 2024 · 8177c47 · 8177c47
1 parent 007840c
commit 8177c47
Show file tree

Hide file tree

Showing 8 changed files with 47 additions and 34 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -5,12 +5,12 @@ plugins {
 }
 
 android {
-    compileSdk = 33
+    compileSdk = 34
 
     defaultConfig {
         applicationId = "se.warting.signaturepad"
         minSdk = 21
-        targetSdk = 33
+        targetSdk = 34
         versionCode = 1
         versionName = "1.0"
 
@@ -30,18 +30,19 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_11
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_11.toString()
+        jvmTarget = JavaVersion.VERSION_17.toString()
         freeCompilerArgs = listOfNotNull(
             "-opt-in=kotlin.RequiresOptIn",
             "-Xskip-prerelease-check"
         )
     }
     buildFeatures {
         compose = true
+        buildConfig = true
     }
     composeOptions {
         kotlinCompilerExtensionVersion = "1.4.4"
@@ -66,6 +67,11 @@ android {
     namespace = "se.warting.signaturepad"
 }
 
+java {
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(17))
+    }
+}
 
 dependencies {
 

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -9,7 +9,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:7.4.2")
+        classpath("com.android.tools.build:gradle:8.2.2")
 
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.10")
         classpath("io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.23.0")

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
+#Fri Jan 26 16:29:11 CET 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/signature-core/api/signature-core.api b/signature-core/api/signature-core.api
@@ -1,10 +1,3 @@
-public final class se/warting/signaturecore/BuildConfig {
-	public static final field BUILD_TYPE Ljava/lang/String;
-	public static final field DEBUG Z
-	public static final field LIBRARY_PACKAGE_NAME Ljava/lang/String;
-	public fun <init> ()V
-}
-
 public final class se/warting/signaturecore/Event : android/os/Parcelable {
 	public static final field $stable I
 	public static final field CREATOR Landroid/os/Parcelable$Creator;

diff --git a/signature-core/build.gradle.kts b/signature-core/build.gradle.kts
@@ -20,7 +20,7 @@ apply(from = "${rootProject.projectDir}/gradle/publish-module.gradle")
 
 
 android {
-    compileSdk = 33
+    compileSdk = 34
 
     defaultConfig {
         minSdk = 21
@@ -33,8 +33,8 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_11
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
     buildFeatures {
         viewBinding = false
@@ -45,7 +45,7 @@ android {
         kotlinCompilerExtensionVersion = "1.4.4"
     }
     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_11.toString()
+        jvmTarget = JavaVersion.VERSION_17.toString()
         freeCompilerArgs = listOfNotNull(
                 "-opt-in=kotlin.RequiresOptIn",
                 "-Xskip-prerelease-check"
@@ -66,7 +66,14 @@ android {
     namespace = "se.warting.signaturecore"
 }
 
-dependencies {
+java {
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(17))
+    }
+}
+
+
+        dependencies {
     val composeBom = platform("androidx.compose:compose-bom:2023.05.01")
     implementation(composeBom)
     androidTestImplementation(composeBom)

diff --git a/signature-pad/api/signature-pad.api b/signature-pad/api/signature-pad.api
@@ -1,10 +1,3 @@
-public final class se/warting/signaturepad/BuildConfig {
-	public static final field BUILD_TYPE Ljava/lang/String;
-	public static final field DEBUG Z
-	public static final field LIBRARY_PACKAGE_NAME Ljava/lang/String;
-	public fun <init> ()V
-}
-
 public final class se/warting/signaturepad/SignaturePadAdapter {
 	public static final field $stable I
 	public fun <init> (Lse/warting/signatureview/views/SignaturePad;)V

diff --git a/signature-pad/build.gradle.kts b/signature-pad/build.gradle.kts
@@ -19,7 +19,7 @@ apply(from = "${rootProject.projectDir}/gradle/publish-module.gradle")
 
 
 android {
-    compileSdk = 33
+    compileSdk = 34
 
     defaultConfig {
         minSdk = 21
@@ -32,8 +32,8 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_11
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
     buildFeatures {
         viewBinding = false
@@ -44,7 +44,7 @@ android {
         kotlinCompilerExtensionVersion = "1.4.4"
     }
     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_11.toString()
+        jvmTarget = JavaVersion.VERSION_17.toString()
         freeCompilerArgs = listOfNotNull(
             "-opt-in=kotlin.RequiresOptIn",
             "-Xskip-prerelease-check"
@@ -65,6 +65,12 @@ android {
     namespace = "se.warting.signaturepad"
 }
 
+java {
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(17))
+    }
+}
+
 dependencies {
     val composeBom = platform("androidx.compose:compose-bom:2023.05.01")
     implementation(composeBom)

diff --git a/signature-view/build.gradle.kts b/signature-view/build.gradle.kts
@@ -19,7 +19,7 @@ val PUBLISH_ARTIFACT_ID by extra("signature-view")
 apply(from = "${rootProject.projectDir}/gradle/publish-module.gradle")
 
 android {
-    compileSdk = 33
+    compileSdk = 34
 
     defaultConfig {
         minSdk = 21
@@ -41,12 +41,13 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_11
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
     buildFeatures {
         viewBinding = false
         compose = false
+        buildConfig = true
     }
     dataBinding {
         enable = true
@@ -56,7 +57,7 @@ android {
         kotlinCompilerExtensionVersion = "1.4.4"
     }
     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_11.toString()
+        jvmTarget = JavaVersion.VERSION_17.toString()
         freeCompilerArgs = listOfNotNull(
             "-opt-in=kotlin.RequiresOptIn",
             "-Xskip-prerelease-check"
@@ -77,6 +78,12 @@ android {
     namespace = "se.warting.signatureview"
 }
 
+java {
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(17))
+    }
+}
+
 dependencies {
     api(project(":signature-core"))
     implementation("androidx.core:core-ktx:1.10.1")