Merge pull request #48 from CathalOConnorRH/dev

Merge changes for CI automation fix
CathalOConnorRH · May 1, 2024 · 9809cbe · 9809cbe
2 parents 7f123c2 + d72b618
commit 9809cbe
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -21,6 +21,7 @@ app/release/*
 build/
 # Local configuration file (sdk path, etc)
 *.properties
+apikey.properties
 
 # Proguard folder generated by Eclipse
 proguard/

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+    "java.configuration.updateBuildConfiguration": "interactive"
+}
diff --git a/apikey.properties b/apikey.properties
@@ -0,0 +1 @@
+tripadvisor=<API_KEY>
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -37,13 +37,11 @@ android {
         properties.load(keystoreFile.inputStream())
 
         //return empty key in case something goes wrong
-        val maps = properties.getProperty("maps") ?: ""
-        val tripadvisor = properties.getProperty("tripadvisor")
-        val openai = properties.getProperty("openai")
+        val maps = properties.getProperty("maps") ?: "<API_KEY>"
+        val tripadvisor = properties.getProperty("tripadvisor")?: "<API_KEY>"
 
         resValue("string", "maps" , maps)
         resValue("string", "tripadvisor" , tripadvisor)
-        resValue("string", "openai" , openai)
 
         applicationId = "ie.coconnor.mobileappdev"
         minSdk = 25