diff --git a/android/build.gradle b/android/build.gradle index d813dd7..d869a77 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -9,7 +9,7 @@ buildscript { } dependencies { - classpath "com.android.tools.build:gradle:7.2.1" + classpath "com.android.tools.build:gradle:8.1.1" } } @@ -59,7 +59,7 @@ android { targetSdkVersion getExtOrIntegerDefault("targetSdkVersion") buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString() ndk { - abiFilters "armeabi-v7a", "x86", "arm64-v8a" + abiFilters "armeabi-v7a", "arm64-v8a", "x86_64" } } @@ -74,8 +74,8 @@ android { } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 } } diff --git a/android/gradle.properties b/android/gradle.properties index 318524f..073b3af 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -1,5 +1,5 @@ -PrinterImin_kotlinVersion=1.7.0 +PrinterImin_kotlinVersion=1.8.10 PrinterImin_minSdkVersion=21 -PrinterImin_targetSdkVersion=31 -PrinterImin_compileSdkVersion=31 -PrinterImin_ndkversion=21.4.7075529 +PrinterImin_targetSdkVersion=34 +PrinterImin_compileSdkVersion=34 +PrinterImin_ndkversion=23.1.7779620 diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..6c11ea3 --- /dev/null +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip +networkTimeout=10000 +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists \ No newline at end of file diff --git a/android/src/main/java/com/printerimin/PrinterIminModule.java b/android/src/main/java/com/printerimin/PrinterIminModule.java index 4eac092..7bb6925 100644 --- a/android/src/main/java/com/printerimin/PrinterIminModule.java +++ b/android/src/main/java/com/printerimin/PrinterIminModule.java @@ -2031,7 +2031,11 @@ private void initializeBroadcastReceiver() { mBroadcastReceiver = createChargingStateBroadcastReceiver(); intentFilter.addAction(ACTION_PRITER_STATUS_CHANGE); intentFilter.addAction(ACTION_POGOPIN_STATUS_CHANGE); - getReactApplicationContext().registerReceiver(mBroadcastReceiver, intentFilter); + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { + getReactApplicationContext().registerReceiver(mBroadcastReceiver, intentFilter, Context.RECEIVER_EXPORTED); + } else { + getReactApplicationContext().registerReceiver(mBroadcastReceiver, intentFilter); + } } @ReactMethod diff --git a/example/android/build.gradle b/example/android/build.gradle index ffb8f3d..1bb8194 100644 --- a/example/android/build.gradle +++ b/example/android/build.gradle @@ -2,13 +2,14 @@ buildscript { ext { - buildToolsVersion = "33.0.0" + buildToolsVersion = "34.0.0" minSdkVersion = 21 - compileSdkVersion = 33 - targetSdkVersion = 33 + compileSdkVersion = 34 + targetSdkVersion = 34 // We use NDK 23 which has both M1 support and is the side-by-side NDK version from AGP. ndkVersion = "23.1.7779620" + kotlinVersion = "1.8.10" } repositories { google() @@ -17,7 +18,8 @@ buildscript { // maven { url "https://maven.aliyun.com/repository/central" } } dependencies { - classpath("com.android.tools.build:gradle") + classpath("com.android.tools.build:gradle:8.1.1") classpath("com.facebook.react:react-native-gradle-plugin") + classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion") } }