Support of the gradle 7x (#1937)

* #1925 added support of the gradle 7x
* switched to the legacy native libs packaging
* #1925 switched to the legacy native libs packaging
Co-authored-by: Michael Paschenko <mpaschenko@gmail.com>
pull/1938/head
James Brown 3 years ago committed by GitHub
parent c242192ad8
commit 1a2215fc61
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 5
      app/build.gradle
  2. 1
      app/src/main/AndroidManifest.xml
  3. 3
      build.gradle
  4. 2
      dmz/build.gradle
  5. 2
      gradle/wrapper/gradle-wrapper.properties

@ -52,6 +52,11 @@ android {
ndk { ndk {
abiFilters "armeabi-v7a", "x86", "x86_64", "arm64-v8a" abiFilters "armeabi-v7a", "x86", "x86_64", "arm64-v8a"
} }
packagingOptions {
jniLibs {
useLegacyPackaging true
}
}
} }
flavorDimensions "targetting" flavorDimensions "targetting"

@ -20,6 +20,7 @@
android:required="false" /> android:required="false" />
<application <application
android:extractNativeLibs="true"
android:name=".App" android:name=".App"
android:allowBackup="false" android:allowBackup="false"
android:hardwareAccelerated="true" android:hardwareAccelerated="true"

@ -10,7 +10,8 @@ buildscript {
// don't do that. add that repository to app/build.gradle // don't do that. add that repository to app/build.gradle
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:3.5.4' //NB - there is an issue with newer versions of gradle. The APK balloons out, so far haven't diagnosed why. classpath 'com.android.tools.build:gradle:4.2.2'
//NB - there is an issue with newer versions of gradle. The APK balloons out, so far haven't diagnosed why.
//If you want to try upgrading gradle plugin past 3.5.4 you will need to also diagnose the APK ballooning issue. //If you want to try upgrading gradle plugin past 3.5.4 you will need to also diagnose the APK ballooning issue.
classpath "io.realm:realm-gradle-plugin:10.5.0" classpath "io.realm:realm-gradle-plugin:10.5.0"
// WARNING WARNING WARNING // WARNING WARNING WARNING

@ -35,7 +35,7 @@ dependencies {
implementation group: 'io.reactivex.rxjava2', name: 'rxjava', version: '2.1.12' implementation group: 'io.reactivex.rxjava2', name: 'rxjava', version: '2.1.12'
implementation group: 'org.apache.commons', name: 'commons-io', version: '1.3.2' implementation group: 'org.apache.commons', name: 'commons-io', version: '1.3.2'
testCompile("junit:junit") testImplementation("junit:junit")
implementation project(path: ':lib') implementation project(path: ':lib')
} }

@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip

Loading…
Cancel
Save