diff --git a/.gitignore b/.gitignore index ba6054e..9f566e3 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ .gradle .idea local.properties +/.cxx diff --git a/build.gradle b/build.gradle index fd7e82f..158059b 100644 --- a/build.gradle +++ b/build.gradle @@ -1,20 +1,22 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 28 + namespace "ru.ivanarh.jndcrash" + ndkVersion "27.2.12479018" + compileSdk 35 defaultConfig { - minSdkVersion 15 - targetSdkVersion 28 + minSdkVersion 24 + targetSdkVersion 35 versionCode 1 versionName "1.0" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" externalNativeBuild { cmake { - arguments "-DANDROID_STL=c++_static", "-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON" + arguments "-DANDROID_STL=c++_static", "-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON", "-DCMAKE_SHARED_LINKER_FLAGS=-Wl,-z,max-page-size=16384", "-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON" } } ndk { - abiFilters "x86", "armeabi-v7a", "x86_64", "arm64-v8a" + abiFilters "arm64-v8a", "x86_64" } } @@ -30,21 +32,26 @@ android { path "CMakeLists.txt" } } + + compileOptions { + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 + } } buildscript { repositories { google() - jcenter() + mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:3.4.1' + classpath("com.android.tools.build:gradle:8.9.1") } } repositories { google() - jcenter() + mavenCentral() } dependencies { @@ -53,5 +60,7 @@ dependencies { testImplementation 'junit:junit:4.12' androidTestImplementation 'com.android.support.test:runner:1.0.2' androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' - implementation 'com.android.support:support-annotations:28.0.0' + + + implementation 'androidx.annotation:annotation:1.9.1' } diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml index d08697d..94cbbcf 100644 --- a/src/main/AndroidManifest.xml +++ b/src/main/AndroidManifest.xml @@ -1,2 +1 @@ - + diff --git a/src/main/java/ru/ivanarh/jndcrash/NDCrash.java b/src/main/java/ru/ivanarh/jndcrash/NDCrash.java index 9f2f5af..a23a2f4 100644 --- a/src/main/java/ru/ivanarh/jndcrash/NDCrash.java +++ b/src/main/java/ru/ivanarh/jndcrash/NDCrash.java @@ -2,8 +2,9 @@ import android.content.Context; import android.content.Intent; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; /** * Main binding class for NDCrash functionality. diff --git a/src/main/java/ru/ivanarh/jndcrash/NDCrashService.java b/src/main/java/ru/ivanarh/jndcrash/NDCrashService.java index b919883..2cb2c28 100644 --- a/src/main/java/ru/ivanarh/jndcrash/NDCrashService.java +++ b/src/main/java/ru/ivanarh/jndcrash/NDCrashService.java @@ -4,9 +4,10 @@ import android.content.Intent; import android.content.SharedPreferences; import android.os.IBinder; -import android.support.annotation.CallSuper; import android.util.Log; +import androidx.annotation.CallSuper; + /** * Service for out-of-process crash handling daemon. Should be run from a separate process. */ diff --git a/src/main/java/ru/ivanarh/jndcrash/NDCrashUtils.java b/src/main/java/ru/ivanarh/jndcrash/NDCrashUtils.java index 032437c..b066368 100644 --- a/src/main/java/ru/ivanarh/jndcrash/NDCrashUtils.java +++ b/src/main/java/ru/ivanarh/jndcrash/NDCrashUtils.java @@ -6,7 +6,7 @@ import android.content.pm.PackageManager; import android.content.pm.ServiceInfo; import android.os.Process; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; /** * Contains some utility code.