diff --git a/app/build.gradle b/app/build.gradle index 54cd8a9..c834dca 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -2,14 +2,19 @@ apply plugin: 'com.android.application' ext.versionMajor = 0 -ext.versionMinor = 10 -ext.versionPatch = 20210709 +ext.versionMinor = 50 +ext.versionPatch = 20210929 ext.versionClassifier = null -ext.isSnapshot = true +ext.isSnapshot = false ext.minimumSdkVersion = defaultMinSdkVersion ext.git_version= ("git rev-parse --short HEAD".execute().text.trim()) + android { + signingConfigs { + release { + } + } compileSdkVersion 29 defaultConfig { @@ -20,24 +25,31 @@ android { versionName generateVersionName() // 1.2.3-SNAPSHOT multiDexEnabled true } +/* flavorDimensions "version" + productFlavors { + unsigned { + applicationIdSuffix ".unsigned" + } + }*/ buildTypes { release { minifyEnabled false - //proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } - productFlavors { - } + compileOptions { coreLibraryDesugaringEnabled true sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } - /*dexOptions { + dexOptions { incremental false - }*/ + javaMaxHeapSize "4g" + } + allprojects { tasks.withType(JavaCompile) { options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation" @@ -64,12 +76,12 @@ dependencies { implementation 'com.google.android.material:material:1.4.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' // 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' } diff --git a/build.gradle b/build.gradle index b72d2c1..5348c41 100644 --- a/build.gradle +++ b/build.gradle @@ -19,7 +19,7 @@ ext { compileSdkVersion = '28' buildToolsVersion = '28.0.1' var = '3.4.2' - buildToolsVersion1 = '29.0.3' + //buildToolsVersion1 = '29.0.3' defaultMinSdkVersion = 24 defaultTargetSdkVersion = 30 defaultVersionCode = 1 diff --git a/gradle.properties b/gradle.properties index aaf6f16..cab9572 100644 --- a/gradle.properties +++ b/gradle.properties @@ -18,4 +18,6 @@ # org.gradle.parallel=true android.enableJetifier=true android.useAndroidX=true -org.gradle.unsafe.configuration-cache=true \ No newline at end of file +org.gradle.unsafe.configuration-cache=true +org.gradle.warning.mode=none +org.gradle.unsafe.configuration-cache-problems=warn \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index d41a30a..0a9913d 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Mar 12 10:02:22 CET 2021 +#Wed Sep 29 16:41:02 CEST 2021 distributionBase=GRADLE_USER_HOME +distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip +zipStoreBase=GRADLE_USER_HOME