From 49b82e6c44154f3d3c82082e720da8220c067805 Mon Sep 17 00:00:00 2001
From: Trent Larson <trent@trentlarson.com>
Date: Sun, 16 Mar 2025 17:28:47 -0600
Subject: [PATCH] rename app ID from app.timesafari.app to app.timesafari &
 adjust tests (Java 20 works)

---
 .../buildOutputCleanup.lock                   | Bin 17 -> 17 bytes
 android/.gradle/file-system.probe             | Bin 8 -> 8 bytes
 android/app/build.gradle                      |   4 +--
 .../app/ExampleInstrumentedTest.java          |   2 +-
 .../myapp/ExampleInstrumentedTest.java        |  26 ------------------
 android/app/src/main/assets/public/index.html |   2 +-
 scripts/test-android.js                       |  12 ++++----
 test-scripts/run-deeplink-tests.sh            |   2 +-
 8 files changed, 11 insertions(+), 37 deletions(-)
 delete mode 100644 android/app/src/androidTest/java/com/getcapacitor/myapp/ExampleInstrumentedTest.java

diff --git a/android/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/android/.gradle/buildOutputCleanup/buildOutputCleanup.lock
index dc169ce736d4ec51b4656173474ff663f597450a..79551c941b15345a58a913a338ce0380128e9976 100644
GIT binary patch
literal 17
VcmZSXnf1(g=K^<m1~3pU2LLrc1dadz

literal 17
VcmZSXnf1(g=K^<m1~A~>1^_i`1j7IT

diff --git a/android/.gradle/file-system.probe b/android/.gradle/file-system.probe
index 5c1254f36a57338ad10ffb65d81410d5b1893573..c49b9e9d1dc93a940ccb3b66ea8c2e302375985d 100644
GIT binary patch
literal 8
PcmZQzV4S+pj#(T422uf#

literal 8
PcmZQzV4T`%H1RP22etyn

diff --git a/android/app/build.gradle b/android/app/build.gradle
index 74f170dd..acc73464 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -1,10 +1,10 @@
 apply plugin: 'com.android.application'
 
 android {
-    namespace "app.timesafari.app"
+    namespace "app.timesafari"
     compileSdk rootProject.ext.compileSdkVersion
     defaultConfig {
-        applicationId "app.timesafari.app"
+        applicationId "app.timesafari"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 1
diff --git a/android/app/src/androidTest/java/app/timesafari/app/ExampleInstrumentedTest.java b/android/app/src/androidTest/java/app/timesafari/app/ExampleInstrumentedTest.java
index cf6765a8..28cfc7cd 100644
--- a/android/app/src/androidTest/java/app/timesafari/app/ExampleInstrumentedTest.java
+++ b/android/app/src/androidTest/java/app/timesafari/app/ExampleInstrumentedTest.java
@@ -15,6 +15,6 @@ public class ExampleInstrumentedTest {
     public void useAppContext() {
         // Context of the app under test.
         Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
-        assertEquals("app.timesafari.app", appContext.getPackageName());
+        assertEquals("app.timesafari", appContext.getPackageName());
     }
 } 
\ No newline at end of file
diff --git a/android/app/src/androidTest/java/com/getcapacitor/myapp/ExampleInstrumentedTest.java b/android/app/src/androidTest/java/com/getcapacitor/myapp/ExampleInstrumentedTest.java
deleted file mode 100644
index f2c2217e..00000000
--- a/android/app/src/androidTest/java/com/getcapacitor/myapp/ExampleInstrumentedTest.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.getcapacitor.myapp;
-
-import static org.junit.Assert.*;
-
-import android.content.Context;
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-import androidx.test.platform.app.InstrumentationRegistry;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-/**
- * Instrumented test, which will execute on an Android device.
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-@RunWith(AndroidJUnit4.class)
-public class ExampleInstrumentedTest {
-
-    @Test
-    public void useAppContext() throws Exception {
-        // Context of the app under test.
-        Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
-
-        assertEquals("com.getcapacitor.app", appContext.getPackageName());
-    }
-}
diff --git a/android/app/src/main/assets/public/index.html b/android/app/src/main/assets/public/index.html
index b5f4c83b..cfbe94af 100644
--- a/android/app/src/main/assets/public/index.html
+++ b/android/app/src/main/assets/public/index.html
@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
     <link rel="icon" href="/favicon.ico">
     <title>TimeSafari</title>
-    <script type="module" crossorigin src="/assets/index-DVAb2BqV.js"></script>
+    <script type="module" crossorigin src="/assets/index-CI0bMoT0.js"></script>
   </head>
   <body>
     <noscript>
diff --git a/scripts/test-android.js b/scripts/test-android.js
index 52854123..0f35bd63 100644
--- a/scripts/test-android.js
+++ b/scripts/test-android.js
@@ -77,13 +77,12 @@ const checkConnectedDevices = async (log) => {
 
 // Verify Java installation
 const verifyJavaInstallation = (log) => {
-    log('🔍 Checking Java version...');
-    const javaHome = '/usr/lib/jvm/java-17-openjdk';
+    log('🔍 Checking Java...');
+    const javaHome = process.env.JAVA_HOME;
     if (!existsSync(javaHome)) {
-        throw new Error(`Required Java 17 not found at ${javaHome}. Please install OpenJDK 17.`);
+        throw new Error(`Required Java not found at ${javaHome}. Please install OpenJDK.`);
     }
-    log('✅ Java 17 found');
-    return { JAVA_HOME: javaHome };
+    log('✅ Java found');
 };
 
 // Generate test data using generate_data.ts
@@ -265,9 +264,10 @@ async function runAndroidTests() {
         await generateTestData(log);
 
         await checkConnectedDevices(log);
-        const env = { ...process.env, ...verifyJavaInstallation(log) };
+        await verifyJavaInstallation(log);
         await buildWebAssets(log);
         await configureAndroidProject(log);
+        const env = process.env;
         await buildAndTestAndroid(log, env);
         await runAndroidApp(log, env);
 
diff --git a/test-scripts/run-deeplink-tests.sh b/test-scripts/run-deeplink-tests.sh
index 3a35cd08..d5b10d5a 100755
--- a/test-scripts/run-deeplink-tests.sh
+++ b/test-scripts/run-deeplink-tests.sh
@@ -74,7 +74,7 @@ execute_deeplink() {
         echo "---"
     else
         # Stop the app before executing the deep link
-        adb shell am force-stop app.timesafari.app
+        adb shell am force-stop app.timesafari
         sleep 1  # Give it a moment to fully stop
         
         if adb shell am start -W -a android.intent.action.VIEW \