From 8c43dfd58f88f9a4f66d9ea726a7a47e947adf6f Mon Sep 17 00:00:00 2001
From: jacques <jacques+commit@foucry.net>
Date: Sat, 20 Nov 2021 10:42:28 +0100
Subject: [PATCH 1/5] Add apk output

---
 app/.gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/.gitignore b/app/.gitignore
index 796b96d..6018cdc 100644
--- a/app/.gitignore
+++ b/app/.gitignore
@@ -1 +1,2 @@
 /build
+/beforerelease/prerelease/output-metadata.json

From af50a1cc3de355650203e3fd69b2f9efa8d69235 Mon Sep 17 00:00:00 2001
From: jacques <jacques+commit@foucry.net>
Date: Sat, 20 Nov 2021 10:43:02 +0100
Subject: [PATCH 2/5] Change suggested by IDE

---
 app/src/main/AndroidManifest.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 52ed3af..ebfc2b6 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -53,7 +53,8 @@
 <!--        <service
             android:name=".PillDroidJobService"
             android:permission="android.permission.BIND_JOB_SERVICE" />-->
-        <receiver android:name="net.foucry.pilldroid.AlarmReceiver" >
+        <receiver android:name="net.foucry.pilldroid.AlarmReceiver"
+            android:exported="false">
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED"/>
             </intent-filter>

From a7e6db6adf960582f65ce138d06c5efc08e51213 Mon Sep 17 00:00:00 2001
From: jacques <jacques+commit@foucry.net>
Date: Sat, 20 Nov 2021 10:44:01 +0100
Subject: [PATCH 3/5] Add buildType and flavors

---
 app/build.gradle | 43 ++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 38 insertions(+), 5 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index dd43b0f..b5535e2 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -2,18 +2,23 @@
 apply plugin: 'com.android.application'
 
 ext.versionMajor = 0
-ext.versionMinor = 55
-ext.versionPatch = 20211003
+ext.versionMinor = 60
+ext.versionPatch = 20211115
 ext.versionClassifier = null
 ext.isSnapshot = false
 ext.minimumSdkVersion = defaultMinSdkVersion
 ext.git_version= ("git rev-parse --short HEAD".execute().text.trim())
 
-
 android {
     signingConfigs {
         release {
         }
+        prerelease {
+            storeFile file('/home/jacques/.config/keystore')
+            storePassword 'nifgk/Cr'
+            keyAlias 'prerelase'
+            keyPassword 'nifgk/Cr'
+        }
     }
     compileSdkVersion 29
 
@@ -27,9 +32,37 @@ android {
     }
 
     buildTypes {
+        debug {
+            minifyEnabled false
+            debuggable true
+            applicationIdSuffix ".debug"
+        }
         release {
+            minifyEnabled true
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            debuggable false
+        }
+        prerelease {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            debuggable false
+            signingConfig signingConfigs.prerelease
+        }
+    }
+    flavorDimensions "version"
+    productFlavors {
+        dev {
+            resValue "string", "app_name", "PillDroid dev"
+            dimension ="version"
+        }
+
+        product {
+            resValue "string", "app_name", "PillDroid"
+            dimension ="version"
+        }
+        preproduct {
+            resValue "string", "app_name", "PillDroid Pre-Release"
+            dimension ="version"
         }
     }
 
@@ -70,12 +103,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.2.0'
+    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.2.0'
+    implementation 'io.sentry:sentry-android:5.4.0'
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
 }
 

From ff6dd3a8ec432b0ded53920d0d2ba8671c799a4c Mon Sep 17 00:00:00 2001
From: jacques <jacques+commit@foucry.net>
Date: Sat, 20 Nov 2021 10:44:25 +0100
Subject: [PATCH 4/5] Change jcenter by mavencentral

---
 build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index 0f9d530..0948da1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
     repositories {
-        jcenter()
+        mavenCentral()
         maven {
             url 'https://maven.google.com/'
             name 'Google'
@@ -28,7 +28,7 @@ ext {
 
 allprojects {
     repositories {
-        jcenter()
+        mavenCentral()
         maven {
             url 'https://maven.google.com/'
             name 'Google'

From 5712bc586d07a2fd22374ac972331c9a4186c629 Mon Sep 17 00:00:00 2001
From: jacques <jacques+commit@foucry.net>
Date: Sat, 20 Nov 2021 10:45:03 +0100
Subject: [PATCH 5/5] Remove app_name to be compliant with flavors

---
 app/src/main/res/values-fr-rFR/strings.xml | 1 -
 app/src/main/res/values/strings.xml        | 1 -
 2 files changed, 2 deletions(-)

diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml
index 057b307..18f6fa8 100644
--- a/app/src/main/res/values-fr-rFR/strings.xml
+++ b/app/src/main/res/values-fr-rFR/strings.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">PillDroid</string>
     <string name="title_drug_detail">Détail Médicament</string>
     <string name="button_cancel">Annuler</string>
     <string name="button_ok">OK</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a7b4338..febb2af 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,5 +1,4 @@
 <resources>
-    <string name="app_name">PillDroid</string>
     <string name="title_drug_detail">Drug Detail</string>
     <string name="button_cancel">Cancel</string>
     <string name="button_ok">OK</string>