diff --git a/app/build.gradle b/app/build.gradle index a49bfd1..20911f7 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,7 +1,9 @@ -apply plugin: 'com.android.application' -apply plugin: 'kotlin-android' -apply plugin: 'kotlin-android-extensions' -apply plugin: 'kotlin-kapt' +plugins { + id 'com.android.application' + id 'kotlin-android' + id 'kotlin-android-extensions' + id 'kotlin-kapt' +} android { defaultConfig { @@ -9,8 +11,8 @@ android { applicationId 'top.fumiama.copymanga' minSdkVersion 23 targetSdkVersion 34 - versionCode 59 - versionName '2.3.1' + versionCode 60 + versionName '2.3.2' resourceConfigurations += ['zh', 'zh-rCN'] testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" @@ -20,6 +22,8 @@ android { } } + ndkVersion "26.3.11579264" + signingConfigs { release { enableV1Signing true @@ -47,11 +51,6 @@ android { proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' }*/ } - sourceSets { - main { - jniLibs.srcDirs = ['libs'] - } - } compileOptions { sourceCompatibility JavaVersion.VERSION_11 targetCompatibility JavaVersion.VERSION_11 @@ -84,6 +83,7 @@ dependencies { implementation 'com.github.yalantis:ucrop:2.2.6' implementation 'com.to.aboomy:pager2banner:1.0.1' implementation 'com.github.bumptech.glide:glide:4.16.0' + //noinspection KaptUsageInsteadOfKsp kapt 'com.github.bumptech.glide:compiler:4.16.0' implementation 'com.google.code.gson:gson:2.10.1' implementation 'com.github.vovaksenov99:OverscrollableScrollView:1.0' @@ -92,5 +92,5 @@ dependencies { implementation 'com.lapism:search:2.4.1@aar' implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.7.0' implementation 'com.airbnb.android:lottie:6.4.0' - implementation 'net.java.dev.jna:jna:5.14.0' + implementation 'net.java.dev.jna:jna:5.14.0@aar' } diff --git a/app/libs/arm64-v8a/libjnidispatch.so b/app/libs/arm64-v8a/libjnidispatch.so deleted file mode 100644 index cd7e671..0000000 Binary files a/app/libs/arm64-v8a/libjnidispatch.so and /dev/null differ diff --git a/app/libs/armeabi-v7a/libjnidispatch.so b/app/libs/armeabi-v7a/libjnidispatch.so deleted file mode 100644 index 603883e..0000000 Binary files a/app/libs/armeabi-v7a/libjnidispatch.so and /dev/null differ diff --git a/app/libs/x86/libjnidispatch.so b/app/libs/x86/libjnidispatch.so deleted file mode 100644 index e9094b6..0000000 Binary files a/app/libs/x86/libjnidispatch.so and /dev/null differ diff --git a/app/libs/x86_64/libjnidispatch.so b/app/libs/x86_64/libjnidispatch.so deleted file mode 100644 index e594b88..0000000 Binary files a/app/libs/x86_64/libjnidispatch.so and /dev/null differ diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 622a543..f349a9c 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -77,9 +77,7 @@ ##---------------End: proguard configuration for Gson ---------- --keep class com.sun.jna.** { *; } --keep class * implements com.sun.jna.** { *; } --dontwarn java.awt.Component --dontwarn java.awt.GraphicsEnvironment --dontwarn java.awt.HeadlessException --dontwarn java.awt.Window +## JNA Proguard rules +-dontwarn java.awt.* +-keep class com.sun.jna.* { *; } +-keepclassmembers class * extends com.sun.jna.* { public *; }