diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts
index d9c0d04..63450ba 100644
--- a/android/app/build.gradle.kts
+++ b/android/app/build.gradle.kts
@@ -1,13 +1,19 @@
+import java.util.Properties
+import java.io.FileInputStream
+
plugins {
id("com.android.application")
- // START: FlutterFire Configuration
id("com.google.gms.google-services")
- // END: FlutterFire Configuration
id("kotlin-android")
- // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins.
id("dev.flutter.flutter-gradle-plugin")
}
+val keystoreProperties = Properties()
+val keystorePropertiesFile = rootProject.file("key.properties")
+if (keystorePropertiesFile.exists()) {
+ keystoreProperties.load(FileInputStream(keystorePropertiesFile))
+}
+
android {
namespace = "be.davdayronvl.travel_mate"
compileSdk = flutter.compileSdkVersion
@@ -32,18 +38,23 @@ android {
versionCode = flutter.versionCode
versionName = flutter.versionName
}
+
signingConfigs {
- release {
- keyAlias = keystoreProperties['keyAlias']
- keyPassword = keystoreProperties['keyPassword']
- storeFile = keystoreProperties['storeFile'] ? file(keystoreProperties['storeFile']) : null
- storePassword = keystoreProperties['storePassword']
+ create("release") {
+ keyAlias = keystoreProperties["keyAlias"] as String?
+ keyPassword = keystoreProperties["keyPassword"] as String?
+ storeFile = if (keystoreProperties["storeFile"] != null) {
+ file(keystoreProperties["storeFile"] as String)
+ } else {
+ null
+ }
+ storePassword = keystoreProperties["storePassword"] as String?
}
}
buildTypes {
release {
- signingConfig = signingConfigs.release
+ signingConfig = signingConfigs.getByName("release")
}
}
}
diff --git a/android/app/google-services.json b/android/app/google-services.json
index 070c1b2..e4c4270 100644
--- a/android/app/google-services.json
+++ b/android/app/google-services.json
@@ -9,7 +9,7 @@
"client_info": {
"mobilesdk_app_id": "1:521527250907:android:be3db7fc84f053ec7da1fe",
"android_client_info": {
- "package_name": "com.example.travel_mate"
+ "package_name": "be.davdayronvl.travel_mate"
}
},
"oauth_client": [
@@ -17,7 +17,7 @@
"client_id": "521527250907-lqgj1lmfcsjusm2be9r6kpuanq3jvjcd.apps.googleusercontent.com",
"client_type": 1,
"android_info": {
- "package_name": "com.example.travel_mate",
+ "package_name": "be.davdayronvl.travel_mate",
"certificate_hash": "9b7e3f14f0fcae0034ed977b5d40305b1812308d"
}
},
diff --git a/android/build/reports/problems/problems-report.html b/android/build/reports/problems/problems-report.html
index f95e6b3..f36afd3 100644
--- a/android/build/reports/problems/problems-report.html
+++ b/android/build/reports/problems/problems-report.html
@@ -225,13 +225,11 @@ template {
.header {
display: flex;
flex-wrap: wrap;
- position: fixed;
top: 0;
left: 0;
width: 100%;
- padding: 24px 24px 0 24px;
+ padding-top: 24px;
background-color: white;
- z-index: 1;
}
.learn-more {
@@ -250,8 +248,6 @@ template {
.content {
font-size: 0.875rem;
- padding: 240px 0 48px;
- overflow-x: auto;
white-space: nowrap;
}
@@ -650,12 +646,12 @@ code + .copy-button {