Adapt to AGP 8.2

Signed-off-by: Andy Scherzinger <[email protected]>
nextcloud · Dec 2, 2023 · eb4c39a · eb4c39a
1 parent 13cf2e5
commit eb4c39a
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 9 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1 +1,3 @@
+android.nonFinalResIds=false
+android.nonTransitiveRClass=false
 android.useAndroidX=true
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Fri Mar 10 15:14:55 CET 2023
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/jitpack.yml b/jitpack.yml
@@ -1 +1 @@
-jdk: openjdk11
+jdk: openjdk17
diff --git a/lib/build.gradle b/lib/build.gradle
@@ -47,8 +47,14 @@ android {
 
     compileOptions {
         coreLibraryDesugaringEnabled true
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
+    }
+
+    publishing {
+        singleVariant('release') {
+            withSourcesJar()
+        }
     }
 
     productFlavors { }
@@ -132,10 +138,12 @@ afterEvaluate {
     publishing {
         publications {
             release(MavenPublication) {
-                from components.release
+                components.getByName('release')
 
                 groupId = 'com.nextcloud.android.sso'
                 artifactId = 'master'
+
+                from components.release
             }
         }
     }

diff --git a/sample/build.gradle b/sample/build.gradle
@@ -3,8 +3,7 @@ apply plugin: 'com.android.application'
 android {
     namespace 'com.nextcloud.android.sso.sample'
 
-    compileSdkVersion 33
-    buildToolsVersion "32.0.0"
+    compileSdk 33
 
     defaultConfig {
         applicationId "com.nextcloud.android.sso.sample"
@@ -24,8 +23,8 @@ android {
     }
     compileOptions {
         coreLibraryDesugaringEnabled true
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 }