Fix build
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
FROM gradle:7.0.2-jdk11
|
||||
FROM gradle:7.0.4-jdk17
|
||||
|
||||
ENV ANDROID_SDK_URL https://dl.google.com/android/repository/commandlinetools-linux-7302050_latest.zip
|
||||
ENV ANDROID_API_LEVEL android-31
|
||||
|
||||
@@ -90,13 +90,6 @@ android {
|
||||
disable 'BlockedPrivateApi'
|
||||
}
|
||||
|
||||
configurations {
|
||||
all {
|
||||
exclude group: 'commons-logging', module: 'commons-logging'
|
||||
exclude group: 'org.apache.httpcomponents', module: 'httpclient'
|
||||
}
|
||||
}
|
||||
|
||||
compileOptions {
|
||||
sourceCompatibility JavaVersion.VERSION_1_8
|
||||
targetCompatibility JavaVersion.VERSION_1_8
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
APP_PLATFORM := android-16
|
||||
APP_PLATFORM := android-21
|
||||
NDK_TOOLCHAIN_VERSION := clang
|
||||
APP_STL := c++_static
|
||||
@@ -6,7 +6,7 @@ buildscript {
|
||||
google()
|
||||
}
|
||||
dependencies {
|
||||
classpath 'com.android.tools.build:gradle:7.1.2'
|
||||
classpath 'com.android.tools.build:gradle:7.0.4'
|
||||
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
|
||||
classpath 'com.google.gms:google-services:4.3.10'
|
||||
}
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
RELEASE_KEY_PASSWORD=android
|
||||
RELEASE_KEY_ALIAS=androidkey
|
||||
RELEASE_STORE_PASSWORD=android
|
||||
org.gradle.jvmargs=-Xmx4096M -XX:MaxPermSize=4096m
|
||||
org.gradle.jvmargs=-Xmx4096M
|
||||
org.gradle.daemon=true
|
||||
org.gradle.parallel=true
|
||||
org.gradle.configureondemand=false
|
||||
|
||||
Reference in New Issue
Block a user