diff options
| -rwxr-xr-x | gradle.properties | 2 | ||||
| -rw-r--r-- | org.fox.epube/build.gradle | 11 | ||||
| -rw-r--r-- | org.fox.epube/proguard-rules.pro | 21 | ||||
| -rw-r--r-- | settings.gradle | 3 |
4 files changed, 11 insertions, 26 deletions
diff --git a/gradle.properties b/gradle.properties index b2d20b2..721f194 100755 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -android.enableJetifier=false +android.enableJetifier=true android.nonFinalResIds=false android.nonTransitiveRClass=false android.useAndroidX=true diff --git a/org.fox.epube/build.gradle b/org.fox.epube/build.gradle index d4a8c9d..85f6a58 100644 --- a/org.fox.epube/build.gradle +++ b/org.fox.epube/build.gradle @@ -14,7 +14,6 @@ android { compileSdkVersion 35 versionCode 10 versionName getVersion() - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" buildConfigField "boolean", "ENABLE_UPDATER", "false" buildConfigField "String", "EPUBE_BASE_URL", "\"https://epube-dev.fakecake.org\"" } @@ -39,7 +38,7 @@ android { buildTypes { release { minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.txt' buildConfigField "String", "EPUBE_BASE_URL", "\"https://books.fakecake.org\"" } @@ -107,8 +106,7 @@ def getVersion() { } dependencies { - implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation 'androidx.appcompat:appcompat:1.7.0' + implementation 'androidx.appcompat:appcompat:1.6.0' implementation 'androidx.webkit:webkit:1.13.0' implementation 'com.evernote:android-state:1.4.1' compileOnly 'com.evernote:android-state:1.4.1' @@ -116,3 +114,8 @@ dependencies { implementation 'com.github.livefront:bridge:v1.1.1' implementation 'com.github.javiersantos:AppUpdater:2.7' } +java { + toolchain { + languageVersion = JavaLanguageVersion.of(17) + } +} diff --git a/org.fox.epube/proguard-rules.pro b/org.fox.epube/proguard-rules.pro deleted file mode 100644 index 6e7ffa9..0000000 --- a/org.fox.epube/proguard-rules.pro +++ /dev/null @@ -1,21 +0,0 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile diff --git a/settings.gradle b/settings.gradle index 9d93383..284aa42 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,2 +1,5 @@ +plugins { + id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0' +} include ':org.fox.epube' rootProject.name='The Epube' |
