Update gradle script

This commit is contained in:
jacques 2021-10-03 13:57:11 +02:00
parent 49352fadd1
commit 4431622534
4 changed files with 29 additions and 15 deletions

View file

@ -2,14 +2,19 @@
apply plugin: 'com.android.application' apply plugin: 'com.android.application'
ext.versionMajor = 0 ext.versionMajor = 0
ext.versionMinor = 10 ext.versionMinor = 50
ext.versionPatch = 20210709 ext.versionPatch = 20210929
ext.versionClassifier = null ext.versionClassifier = null
ext.isSnapshot = true ext.isSnapshot = false
ext.minimumSdkVersion = defaultMinSdkVersion ext.minimumSdkVersion = defaultMinSdkVersion
ext.git_version= ("git rev-parse --short HEAD".execute().text.trim()) ext.git_version= ("git rev-parse --short HEAD".execute().text.trim())
android { android {
signingConfigs {
release {
}
}
compileSdkVersion 29 compileSdkVersion 29
defaultConfig { defaultConfig {
@ -20,24 +25,31 @@ android {
versionName generateVersionName() // 1.2.3-SNAPSHOT versionName generateVersionName() // 1.2.3-SNAPSHOT
multiDexEnabled true multiDexEnabled true
} }
/* flavorDimensions "version"
productFlavors {
unsigned {
applicationIdSuffix ".unsigned"
}
}*/
buildTypes { buildTypes {
release { release {
minifyEnabled false minifyEnabled false
//proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
} }
} }
productFlavors {
}
compileOptions { compileOptions {
coreLibraryDesugaringEnabled true coreLibraryDesugaringEnabled true
sourceCompatibility JavaVersion.VERSION_1_8 sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8
} }
/*dexOptions { dexOptions {
incremental false incremental false
}*/ javaMaxHeapSize "4g"
}
allprojects { allprojects {
tasks.withType(JavaCompile) { tasks.withType(JavaCompile) {
options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation" options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation"
@ -64,12 +76,12 @@ dependencies {
implementation 'com.google.android.material:material:1.4.0' implementation 'com.google.android.material:material:1.4.0'
implementation 'androidx.legacy:legacy-support-v4:1.0.0' implementation 'androidx.legacy:legacy-support-v4:1.0.0'
implementation 'com.journeyapps:zxing-android-embedded:4.1.0' implementation 'com.journeyapps:zxing-android-embedded:4.2.0'
implementation 'androidx.core:core:1.6.0' implementation 'androidx.core:core:1.6.0'
// debugImplementation 'com.amitshekhar.android:debug-db:1.0.6' // debugImplementation 'com.amitshekhar.android:debug-db:1.0.6'
implementation 'io.sentry:sentry-android:4.3.0' implementation 'io.sentry:sentry-android:5.2.0'
coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5' coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
} }

View file

@ -19,7 +19,7 @@ ext {
compileSdkVersion = '28' compileSdkVersion = '28'
buildToolsVersion = '28.0.1' buildToolsVersion = '28.0.1'
var = '3.4.2' var = '3.4.2'
buildToolsVersion1 = '29.0.3' //buildToolsVersion1 = '29.0.3'
defaultMinSdkVersion = 24 defaultMinSdkVersion = 24
defaultTargetSdkVersion = 30 defaultTargetSdkVersion = 30
defaultVersionCode = 1 defaultVersionCode = 1

View file

@ -18,4 +18,6 @@
# org.gradle.parallel=true # org.gradle.parallel=true
android.enableJetifier=true android.enableJetifier=true
android.useAndroidX=true android.useAndroidX=true
org.gradle.unsafe.configuration-cache=true org.gradle.unsafe.configuration-cache=true
org.gradle.warning.mode=none
org.gradle.unsafe.configuration-cache-problems=warn

View file

@ -1,6 +1,6 @@
#Fri Mar 12 10:02:22 CET 2021 #Wed Sep 29 16:41:02 CEST 2021
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip zipStoreBase=GRADLE_USER_HOME