diff --git a/app/build.gradle b/app/build.gradle index f20b96e..f3e90eb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -30,12 +30,6 @@ android { proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } } - - sourceSets { - main { - jniLibs.srcDirs = ["libs"] - } - } } advancedVersioning { @@ -50,8 +44,6 @@ advancedVersioning { } repositories { - mavenLocal() - maven { url 'https://mvn.freenetproject.org' } jcenter() maven { url 'https://jitpack.io' } } @@ -86,8 +78,17 @@ dependencies { implementation 'com.github.freenet-mobile:onion-common:0.0.3' implementation 'com.github.freenet-mobile:onion-fec:0.0.4' implementation 'com.github.freenet-mobile:freenet-ext:0.60.3' - implementation 'com.github.freenet-mobile:fred:1486.5m' - implementation 'com.github.desyncr:plugin-sharesite:0.4.7.3m' + + implementation 'net.java.dev.jna:jna:4.5.2@aar' + implementation ('com.github.freenet-mobile:fred:1486.7m') { + exclude group: 'net.java.dev.jna', module: 'jna' + exclude group: 'net.java.dev.jna', module: 'jna-platform' + } + + implementation ('com.github.desyncr:plugin-sharesite:0.4.7.4m') { + exclude group: 'net.java.dev.jna', module: 'jna' + exclude group: 'net.java.dev.jna', module: 'jna-platform' + } // For running a locally built freenet.jar //implementation "net.java.dev.jna:jna:4.5.2" diff --git a/app/libs/arm64-v8a/libjnidispatch.so b/app/libs/arm64-v8a/libjnidispatch.so deleted file mode 100644 index 54ec7ce..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 79e1fba..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 4045c86..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 afd92ef..0000000 Binary files a/app/libs/x86_64/libjnidispatch.so and /dev/null differ diff --git a/app/version.properties b/app/version.properties index 767a4aa..fc589e3 100644 --- a/app/version.properties +++ b/app/version.properties @@ -1,2 +1,2 @@ -#Sat Aug 29 01:29:45 ART 2020 -AI_VERSION_CODE=100 +#Fri Sep 04 01:19:24 ART 2020 +AI_VERSION_CODE=260