More refactoring

app-common/build.gradle

@@ -8,6 +8,10 @@ plugins {
     id 'dagger.hilt.android.plugin'
 }
 
+
+def gitSha = 'git rev-parse --short HEAD'.execute([], project.rootDir).text.trim()
+def buildTime = new Date().format("yyyy-MM-dd'T'HH:mm:ss'Z'", TimeZone.getTimeZone("GMT+1"))
+
 android {
     compileSdkVersion buildConfig.compileSdk
 
@@ -18,12 +22,38 @@ android {
 
         versionCode buildConfig.version.code
         versionName buildConfig.version.name
+
+        buildConfigField "long", "VERSION_CODE", "${buildConfig.version.code}"
+        buildConfigField "String", "VERSION_NAME", "\"${buildConfig.version.name}\""
+
+        buildConfigField "String", "GITSHA", "\"${gitSha}\""
+        buildConfigField "String", "BUILDTIME", "\"${buildTime}\""
+    }
+
+    flavorDimensions "version"
+    productFlavors {
+        foss {
+
+        }
+        gplay {
+
+        }
     }
 
     buildTypes {
+        def proguardRulesRelease = fileTree(dir: "../proguard", include: ["*.pro"]).asList().toArray()
+        debug {
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt')
+            proguardFiles proguardRulesRelease
+            proguardFiles 'proguard-rules-debug.pro'
+        }
+        beta {
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt')
+            proguardFiles proguardRulesRelease
+        }
         release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt')
+            proguardFiles proguardRulesRelease
         }
     }
 
@@ -57,6 +87,16 @@ android {
 }
 
 dependencies {
+
+    implementation("com.squareup.moshi:moshi:1.13.0")
+    kapt("com.squareup.moshi:moshi-kotlin-codegen:1.13.0")
+
+    // Debugging
+    implementation('com.bugsnag:bugsnag-android:5.9.2')
+    implementation 'com.getkeepsafe.relinker:relinker:1.4.3'
+
+    implementation 'androidx.preference:preference-ktx:1.1.1'
+
     // DI
     implementation "com.google.dagger:dagger:${versions.dagger.core}"
     implementation "com.google.dagger:dagger-android:${versions.dagger.core}"