[android] Fixes android build issue for slf4j2.x (#3384)

Co-authored-by: nobody <nobody@localhost>
deepjavalibrary · Aug 5, 2024 · 904c971 · 904c971
1 parent e03f0ec
commit 904c971
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 12 deletions.
diff --git a/android/build.gradle b/android/build.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.1'
+        classpath 'com.android.tools.build:gradle:8.5.1'
     }
 }
 

diff --git a/android/core/build.gradle b/android/core/build.gradle
@@ -3,12 +3,12 @@ apply plugin: 'maven-publish'
 apply plugin: 'signing'
 
 android {
-    compileSdkVersion 33
-    buildToolsVersion "30.0.3"
+    compileSdkVersion 34
+    namespace "ai.djl.android.core"
 
     defaultConfig {
         minSdkVersion 26
-        targetSdkVersion 33
+        targetSdkVersion 34
         versionCode 1
         versionName "1.0"
 
@@ -25,6 +25,11 @@ android {
         sourceCompatibility = 11
         targetCompatibility = 11
     }
+    publishing {
+        singleVariant("release") {
+            withSourcesJar()
+        }
+    }
 }
 
 signing {

diff --git a/android/core/src/main/AndroidManifest.xml b/android/core/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="ai.djl.android.core">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 <!--  TODO: remove network permission requirement  -->
     <uses-permission android:name="android.permission.INTERNET" />
 </manifest>
diff --git a/android/pytorch-native/build.gradle b/android/pytorch-native/build.gradle
@@ -3,12 +3,12 @@ apply plugin: 'maven-publish'
 apply plugin: 'signing'
 
 android {
-    compileSdkVersion 33
-    buildToolsVersion "30.0.3"
+    compileSdkVersion 34
+    namespace "ai.djl.android.pytorch_native"
 
     defaultConfig {
-        minSdkVersion 24
-        targetSdkVersion 33
+        minSdkVersion 26
+        targetSdkVersion 34
         versionCode 1
         versionName "1.0"
 
@@ -27,6 +27,11 @@ android {
             jniLibs.srcDirs = ["jnilib/"]
         }
     }
+    publishing {
+        singleVariant("release") {
+            withSourcesJar()
+        }
+    }
 }
 
 // TODO: Making publish as an individual gradle file

diff --git a/android/pytorch-native/src/main/AndroidManifest.xml b/android/pytorch-native/src/main/AndroidManifest.xml
@@ -1,2 +1 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="ai.djl.android.pytorch_native" />
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"/>