forked from trent_larson/crowd-funder-for-time-pwa
Fix Android emulator API connectivity with cleaner build script approach
- Move Android-specific API server logic from common.sh to build-android.sh - Remove unnecessary ANDROID_BUILD environment variable - Set localhost:3000 as default in common.sh for all Capacitor builds - Override to 10.0.2.2:3000 specifically in build-android.sh for Android development - Fix execution order issue where common.sh ran before ANDROID_BUILD was set - Maintain proper separation: Android emulator uses 10.0.2.2, iOS simulator uses localhost
This commit is contained in:
@@ -57,13 +57,14 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"android": {
|
"android": {
|
||||||
"allowMixedContent": false,
|
"allowMixedContent": true,
|
||||||
"captureInput": true,
|
"captureInput": true,
|
||||||
"webContentsDebuggingEnabled": false,
|
"webContentsDebuggingEnabled": false,
|
||||||
"allowNavigation": [
|
"allowNavigation": [
|
||||||
"*.timesafari.app",
|
"*.timesafari.app",
|
||||||
"*.jsdelivr.net",
|
"*.jsdelivr.net",
|
||||||
"api.endorser.ch"
|
"api.endorser.ch",
|
||||||
|
"10.0.2.2:3000"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"electron": {
|
"electron": {
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ buildscript {
|
|||||||
mavenCentral()
|
mavenCentral()
|
||||||
}
|
}
|
||||||
dependencies {
|
dependencies {
|
||||||
classpath 'com.android.tools.build:gradle:8.11.1'
|
classpath 'com.android.tools.build:gradle:8.12.0'
|
||||||
classpath 'com.google.gms:google-services:4.4.0'
|
classpath 'com.google.gms:google-services:4.4.0'
|
||||||
|
|
||||||
// NOTE: Do not place your application dependencies here; they belong
|
// NOTE: Do not place your application dependencies here; they belong
|
||||||
|
|||||||
@@ -57,13 +57,14 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"android": {
|
"android": {
|
||||||
"allowMixedContent": false,
|
"allowMixedContent": true,
|
||||||
"captureInput": true,
|
"captureInput": true,
|
||||||
"webContentsDebuggingEnabled": false,
|
"webContentsDebuggingEnabled": false,
|
||||||
"allowNavigation": [
|
"allowNavigation": [
|
||||||
"*.timesafari.app",
|
"*.timesafari.app",
|
||||||
"*.jsdelivr.net",
|
"*.jsdelivr.net",
|
||||||
"api.endorser.ch"
|
"api.endorser.ch",
|
||||||
|
"10.0.2.2:3000"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"electron": {
|
"electron": {
|
||||||
|
|||||||
@@ -166,6 +166,12 @@ log_info "Build type: $BUILD_TYPE"
|
|||||||
# Setup environment for Capacitor build
|
# Setup environment for Capacitor build
|
||||||
setup_build_env "capacitor"
|
setup_build_env "capacitor"
|
||||||
|
|
||||||
|
# Override API server for Android emulator development
|
||||||
|
if [ "$BUILD_MODE" = "development" ]; then
|
||||||
|
export VITE_DEFAULT_ENDORSER_API_SERVER="http://10.0.2.2:3000"
|
||||||
|
log_debug "Android development mode: Using 10.0.2.2 for emulator, production for Image/Partner APIs"
|
||||||
|
fi
|
||||||
|
|
||||||
# Setup application directories
|
# Setup application directories
|
||||||
setup_app_directories
|
setup_app_directories
|
||||||
|
|
||||||
|
|||||||
@@ -197,10 +197,12 @@ setup_build_env() {
|
|||||||
|
|
||||||
# Set API server environment variables based on build mode
|
# Set API server environment variables based on build mode
|
||||||
if [ "$BUILD_MODE" = "development" ]; then
|
if [ "$BUILD_MODE" = "development" ]; then
|
||||||
|
# For Capacitor development, use localhost by default
|
||||||
|
# Android builds will override this in build-android.sh
|
||||||
export VITE_DEFAULT_ENDORSER_API_SERVER="http://localhost:3000"
|
export VITE_DEFAULT_ENDORSER_API_SERVER="http://localhost:3000"
|
||||||
|
log_debug "Development mode: Using localhost for Endorser API, production for Image/Partner APIs"
|
||||||
export VITE_DEFAULT_IMAGE_API_SERVER="https://image-api.timesafari.app"
|
export VITE_DEFAULT_IMAGE_API_SERVER="https://image-api.timesafari.app"
|
||||||
export VITE_DEFAULT_PARTNER_API_SERVER="https://partner-api.endorser.ch"
|
export VITE_DEFAULT_PARTNER_API_SERVER="https://partner-api.endorser.ch"
|
||||||
log_debug "Development mode: Using localhost for Endorser API, production for Image/Partner APIs"
|
|
||||||
elif [ "$BUILD_MODE" = "test" ]; then
|
elif [ "$BUILD_MODE" = "test" ]; then
|
||||||
export VITE_DEFAULT_ENDORSER_API_SERVER="https://test-api.endorser.ch"
|
export VITE_DEFAULT_ENDORSER_API_SERVER="https://test-api.endorser.ch"
|
||||||
export VITE_DEFAULT_IMAGE_API_SERVER="https://image-api.timesafari.app"
|
export VITE_DEFAULT_IMAGE_API_SERVER="https://image-api.timesafari.app"
|
||||||
|
|||||||
Reference in New Issue
Block a user