Merge pull request #567 from /issues/565-update-target-33

Update dependencies and targetSdk to 33
wultra · Jan 8, 2024 · 6cadeeb · 6cadeeb
2 parents d648e49 + 9a8177b
commit 6cadeeb
Show file tree

Hide file tree

Showing 8 changed files with 248 additions and 158 deletions.
diff --git a/proj-android/PowerAuthLibrary/build.gradle b/proj-android/PowerAuthLibrary/build.gradle
@@ -22,8 +22,10 @@ plugins {
 
 
 android {
-    compileSdkVersion rootProject.ext.compileSdkVersion
-    buildToolsVersion rootProject.ext.buildToolsVersion
+    namespace = "io.getlime.security.powerauth"
+
+    compileSdk rootProject.ext.compileSdkVersion
+    buildToolsVersion = rootProject.ext.buildToolsVersion
     ndkVersion rootProject.ext.ndkVersion
 
     defaultConfig {
@@ -45,8 +47,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
     }
 
     sourceSets {
@@ -65,19 +67,26 @@ android {
 
     dependencies {
         implementation 'io.getlime.core:rest-model-base:1.2.0'
-        implementation 'androidx.annotation:annotation:1.4.0'
-        implementation 'androidx.appcompat:appcompat:1.4.2'
-        implementation 'androidx.fragment:fragment:1.5.0'
+        implementation 'androidx.annotation:annotation:1.7.1'
+        implementation 'androidx.appcompat:appcompat:1.6.1'
+        implementation 'androidx.fragment:fragment:1.6.2'
         implementation 'androidx.biometric:biometric:1.1.0'
-        implementation 'com.google.code.gson:gson:2.8.9'
+        implementation 'com.google.code.gson:gson:2.10.1'
 
         // testing
-        androidTestImplementation 'androidx.test:core:1.4.0'
-        androidTestImplementation 'androidx.test:runner:1.4.0'
-        androidTestImplementation 'androidx.test:rules:1.4.0'
-        androidTestImplementation 'androidx.test.ext:junit:1.1.3'
+        androidTestImplementation 'androidx.test:core:1.5.0'
+        androidTestImplementation 'androidx.test:runner:1.5.2'
+        androidTestImplementation 'androidx.test:rules:1.5.0'
+        androidTestImplementation 'androidx.test.ext:junit:1.1.5'
         androidTestImplementation 'io.getlime.core:rest-model-base:1.2.0'
-        androidTestImplementation 'com.google.code.gson:gson:2.8.9'
+        androidTestImplementation 'com.google.code.gson:gson:2.10.1'
+
+        constraints {
+            def kotlinVersion = "1.8.20" // brought transitively from dependencies
+            implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:${kotlinVersion}") {
+                because("Avoids conflicts with different versions of 'kotlin-stdlib'")
+            }
+        }
     }
 
     externalNativeBuild {

diff --git a/proj-android/PowerAuthLibrary/src/androidTest/AndroidManifest.xml b/proj-android/PowerAuthLibrary/src/androidTest/AndroidManifest.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="io.getlime.security.powerauth">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <application android:usesCleartextTraffic="true" />
 </manifest>
diff --git a/proj-android/PowerAuthLibrary/src/main/AndroidManifest.xml b/proj-android/PowerAuthLibrary/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="io.getlime.security.powerauth">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />

diff --git a/proj-android/build.gradle b/proj-android/build.gradle
@@ -24,9 +24,9 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.1'
+        classpath 'com.android.tools.build:gradle:7.4.2'
         // releasing
-        classpath 'io.github.gradle-nexus:publish-plugin:1.1.0'
+        classpath 'io.github.gradle-nexus:publish-plugin:1.3.0'
     }
 }
 
@@ -35,10 +35,10 @@ plugins {
 }
 
 ext {
-    compileSdkVersion = 32
-    targetSdkVersion = 32
+    compileSdkVersion = 33
+    targetSdkVersion = 33
     minSdkVersion = 19
-    buildToolsVersion = "30.0.3"
+    buildToolsVersion = "33.0.2"
     // NDK, check https://developer.android.com/ndk/downloads for updates
     ndkVersion = "25.1.8937393" // r25b
 }

diff --git a/proj-android/gradle/wrapper/gradle-wrapper.jar b/proj-android/gradle/wrapper/gradle-wrapper.jar
diff --git a/proj-android/gradle/wrapper/gradle-wrapper.properties b/proj-android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon May 24 13:49:34 CEST 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists