diff --git a/app/build.gradle b/app/build.gradle index 65ba1e3..308f021 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,13 +1,13 @@ //noinspection GradleCompatible apply plugin: 'com.android.application' -ext.versionMajor = 0 +/*ext.versionMajor = 0 ext.versionMinor = 65 ext.versionPatch = new Date().format("yyyyMMdd") ext.versionClassifier = null ext.isSnapshot = false 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())*/ // Try reading secrets from file def secretsPropertiesFile = rootProject.file("secrets.properties") @@ -40,8 +40,8 @@ android { applicationId "net.foucry.pilldroid" minSdkVersion defaultMinSdkVersion targetSdkVersion defaultTargetSdkVersion - versionCode generateVersionCode() // 190010203 - versionName generateVersionName() // 1.2.3-SNAPSHOT + versionCode 100 + versionName "beta+0.100" multiDexEnabled true } @@ -120,12 +120,11 @@ dependencies { implementation 'com.journeyapps:zxing-android-embedded:4.3.0' implementation 'androidx.core:core:1.6.0' -// debugImplementation 'com.amitshekhar.android:debug-db:1.0.6' - implementation 'io.sentry:sentry-android:5.4.0' coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5' } +/* private Integer generateVersionCode() { return ext.minimumSdkVersion * 1000 + ext.versionMajor * 100 + ext.versionMinor } @@ -146,4 +145,4 @@ private String generateVersionName() { print "Version name = " + versionName return versionName -} \ No newline at end of file +}*/ diff --git a/build.gradle b/build.gradle index cfe6773..000240b 100644 --- a/build.gradle +++ b/build.gradle @@ -24,6 +24,7 @@ ext { defaultTargetSdkVersion = 30 defaultVersionCode = 1 defaultVersionCode1 = defaultVersionCode + defaultVersionName = 'beta-0.+$versioncode' } allprojects {