diff --git a/.gitignore b/.gitignore index e79c41e..fd1f9dc 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ build *.iml *.local *.jks +*.tmp diff --git a/README.md b/README.md index fdec169..5abc3ab 100644 --- a/README.md +++ b/README.md @@ -14,6 +14,8 @@ This repository contains Android application sources of i2pd ### Install g++, OpenJDK 11+, gradle 5.1+ + * Note: openjdk 17 has also been tested okay. + ```bash sudo apt-get install g++ openjdk-11-jdk gradle ``` @@ -58,7 +60,7 @@ pushd binary/jni ./build.sh -d popd -gradle clean assembleDebug +./gradlew clean assembleDebug ``` You will find APKs in `app/build/outputs/apk` diff --git a/app/build.gradle b/app/build.gradle index 0178977..53505f3 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -17,16 +17,12 @@ dependencies { } android { - lintOptions { - // Not so a good way - disable 'DuplicatePlatformClasses' - } - - compileSdkVersion 33 + // do not remove, it is deprecated & nevertheless required + compileSdkVersion 35 defaultConfig { applicationId "org.purplei2p.i2pd" - targetSdkVersion 33 + targetSdkVersion 35 // TODO: 24? minSdkVersion 16 versionCode 2550000 @@ -89,6 +85,12 @@ android { targetCompatibility = JavaVersion.VERSION_1_8 } namespace 'org.purplei2p.i2pd' + lint { + disable 'DuplicatePlatformClasses' + } + buildFeatures { + buildConfig = true + } } ext.abiCodes = ['armeabi-v7a': 1, 'x86': 2, 'arm64-v8a': 3, 'x86_64': 4] diff --git a/app/src/main/java/org/purplei2p/i2pd/I2PDPermsAskerActivity.java b/app/src/main/java/org/purplei2p/i2pd/I2PDPermsAskerActivity.java index 2df2780..9ae3b3e 100644 --- a/app/src/main/java/org/purplei2p/i2pd/I2PDPermsAskerActivity.java +++ b/app/src/main/java/org/purplei2p/i2pd/I2PDPermsAskerActivity.java @@ -20,8 +20,6 @@ public class I2PDPermsAskerActivity extends Activity { private static final int PERMISSION_WRITE_EXTERNAL_STORAGE = 0; - private static final int PERMISSION_MANAGE_EXTERNAL_STORAGE = 0; - private Button button_request_write_ext_storage_perms; private TextView textview_retry; diff --git a/build.gradle b/build.gradle index c7da454..4dfbf30 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:7.3.1' + classpath 'com.android.tools.build:gradle:8.7.0' } } diff --git a/gradle.properties b/gradle.properties index dfb2fa4..9d65435 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,6 @@ android.enableJetifier=true +android.nonFinalResIds=false +android.nonTransitiveRClass=false android.useAndroidX=true org.gradle.parallel=true +org.gradle.jvmargs=-Xmx2048m "-XX:MaxMetaspaceSize=1024m" \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 1debed0..2fa91c5 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=8cc27038d5dbd815759851ba53e70cf62e481b87494cc97cfd97982ada5ba634 -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists