trent_larson
/
crowd-funder-for-time-pwa
4
1
Fork 2
Code Pull Requests 8 Releases 5 Wiki Activity
Browse Source

rename app ID from app.timesafari.app to app.timesafari & adjust tests (Java 20 works)

pull/127/head
Trent Larson 2 months ago
parent
6f4fbc697f
commit
49b82e6c44
8 changed files with 11 additions and 37 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. BIN
      android/.gradle/buildOutputCleanup/buildOutputCleanup.lock
  2. BIN
      android/.gradle/file-system.probe
  3. 4
      android/app/build.gradle
  4. 2
      android/app/src/androidTest/java/app/timesafari/app/ExampleInstrumentedTest.java
  5. 26
      android/app/src/androidTest/java/com/getcapacitor/myapp/ExampleInstrumentedTest.java
  6. 2
      android/app/src/main/assets/public/index.html
  7. 12
      scripts/test-android.js
  8. 2
      test-scripts/run-deeplink-tests.sh

BIN
android/.gradle/buildOutputCleanup/buildOutputCleanup.lock
View File

Binary file not shown.

BIN
android/.gradle/file-system.probe
View File

Binary file not shown.

4
android/app/build.gradle
View File

@ -1,10 +1,10 @@
apply plugin: 'com.android.application' apply plugin: 'com.android.application'
android { android {
namespace "app.timesafari.app" namespace "app.timesafari"
compileSdk rootProject.ext.compileSdkVersion compileSdk rootProject.ext.compileSdkVersion
defaultConfig { defaultConfig {
applicationId "app.timesafari.app" applicationId "app.timesafari"
minSdkVersion rootProject.ext.minSdkVersion minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1 versionCode 1

2
android/app/src/androidTest/java/app/timesafari/app/ExampleInstrumentedTest.java
View File

@ -15,6 +15,6 @@ public class ExampleInstrumentedTest {
public void useAppContext() { public void useAppContext() {
// Context of the app under test. // Context of the app under test.
Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext(); Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
assertEquals("app.timesafari.app", appContext.getPackageName()); assertEquals("app.timesafari", appContext.getPackageName());
} }
} }

26
android/app/src/androidTest/java/com/getcapacitor/myapp/ExampleInstrumentedTest.java
View File

@ -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());
}
}

2
android/app/src/main/assets/public/index.html
View File

@ -6,7 +6,7 @@
<meta name="viewport" content="width=device-width,initial-scale=1.0"> <meta name="viewport" content="width=device-width,initial-scale=1.0">
<link rel="icon" href="/favicon.ico"> <link rel="icon" href="/favicon.ico">
<title>TimeSafari</title> <title>TimeSafari</title>
<script type="module" crossorigin src="/assets/index-DVAb2BqV.js"></script> <script type="module" crossorigin src="/assets/index-CI0bMoT0.js"></script>
</head> </head>
<body> <body>
<noscript> <noscript>

12
scripts/test-android.js
View File

@ -77,13 +77,12 @@ const checkConnectedDevices = async (log) => {
// Verify Java installation // Verify Java installation
const verifyJavaInstallation = (log) => { const verifyJavaInstallation = (log) => {
log('🔍 Checking Java version...'); log('🔍 Checking Java...');
const javaHome = '/usr/lib/jvm/java-17-openjdk'; const javaHome = process.env.JAVA_HOME;
if (!existsSync(javaHome)) { 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'); log('✅ Java found');
return { JAVA_HOME: javaHome };
}; };
// Generate test data using generate_data.ts // Generate test data using generate_data.ts
@ -265,9 +264,10 @@ async function runAndroidTests() {
await generateTestData(log); await generateTestData(log);
await checkConnectedDevices(log); await checkConnectedDevices(log);
const env = { ...process.env, ...verifyJavaInstallation(log) }; await verifyJavaInstallation(log);
await buildWebAssets(log); await buildWebAssets(log);
await configureAndroidProject(log); await configureAndroidProject(log);
const env = process.env;
await buildAndTestAndroid(log, env); await buildAndTestAndroid(log, env);
await runAndroidApp(log, env); await runAndroidApp(log, env);

2
test-scripts/run-deeplink-tests.sh
View File

@ -74,7 +74,7 @@ execute_deeplink() {
echo "---" echo "---"
else else
# Stop the app before executing the deep link # 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 sleep 1 # Give it a moment to fully stop
if adb shell am start -W -a android.intent.action.VIEW \ if adb shell am start -W -a android.intent.action.VIEW \

Write Preview
Loading…
Cancel
Save