Fix SDK API 34 build issues

ltrudu · Aug 23, 2024 · d63ec19 · d63ec19
1 parent 6dac66c
commit d63ec19
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/PrintWrapper/build.gradle b/PrintWrapper/build.gradle
@@ -15,10 +15,10 @@ android {
     compileSdkVersion 34
 
     defaultConfig {
-        minSdkVersion 25
+        minSdkVersion 29
         targetSdkVersion 34
-        versionCode 10
-        versionName "1.9.34"
+        versionCode 11
+        versionName "1.10"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
@@ -55,13 +55,21 @@ android {
     }
 }
 
+configurations.all {
+    resolutionStrategy.force "org.jetbrains.kotlin:kotlin-stdlib:1.8.22"
+    resolutionStrategy.force "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22"
+}
+
+
 dependencies {
     //implementation fileTree(dir: "libs", include: ["*.jar"])
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:1.8.22"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.22"
+
     implementation files('libs/ZSDK_ANDROID_API.jar')
     implementation files('libs/jackson-core-2.2.3.jar')
     implementation files('libs/jackson-annotations-2.2.3.jar')
     implementation files('libs/jackson-databind-2.2.3.jar')
-    implementation 'androidx.appcompat:appcompat:1.2.0'
     testImplementation 'junit:junit:4.12'
     implementation 'com.tom-roush:pdfbox-android:2.0.27.0'
 

diff --git a/PrintWrapper/src/main/java/com/zebra/printwrapper/PrinterDiscoveryDataMapHelper.java b/PrintWrapper/src/main/java/com/zebra/printwrapper/PrinterDiscoveryDataMapHelper.java
@@ -17,8 +17,6 @@
 import java.util.Map;
 import java.util.concurrent.CountDownLatch;
 
-import static androidx.core.content.ContextCompat.getSystemService;
-
 public class PrinterDiscoveryDataMapHelper {
 
     private static final String TAG = "USBConnect";