diff --git a/.gitignore b/.gitignore index 9db064af..de567294 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,13 @@ # MacOS files .DS_Store .idea + +# Not using Zero-Installs +.yarn/* +!.yarn/releases +!.yarn/plugins +.pnp.* + +# using Zero Installs +#.yarn/unplugged +#.yarn/build-state.yml \ No newline at end of file diff --git a/x/examples/outline-connectivity-app/app_mobile/android/app/src/main/AndroidManifest.xml b/x/examples/outline-connectivity-app/app_mobile/android/app/src/main/AndroidManifest.xml index 4d7ca380..338dbac2 100644 --- a/x/examples/outline-connectivity-app/app_mobile/android/app/src/main/AndroidManifest.xml +++ b/x/examples/outline-connectivity-app/app_mobile/android/app/src/main/AndroidManifest.xml @@ -7,7 +7,9 @@ android:label="@string/app_name" android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" - android:theme="@style/AppTheme"> + android:theme="@style/AppTheme" + android:usesCleartextTraffic="true"> + + diff --git a/x/examples/outline-connectivity-app/app_mobile/android/build.gradle b/x/examples/outline-connectivity-app/app_mobile/android/build.gradle index 380a22c1..b99ca505 100644 --- a/x/examples/outline-connectivity-app/app_mobile/android/build.gradle +++ b/x/examples/outline-connectivity-app/app_mobile/android/build.gradle @@ -9,7 +9,7 @@ buildscript { } dependencies { - classpath "com.android.tools.build:gradle:8.1.1" + classpath 'com.android.tools.build:gradle:8.1.2' classpath "com.google.gms:google-services:4.3.15" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version" diff --git a/x/examples/outline-connectivity-app/package.json b/x/examples/outline-connectivity-app/package.json index cf26addb..ee3a75d7 100644 --- a/x/examples/outline-connectivity-app/package.json +++ b/x/examples/outline-connectivity-app/package.json @@ -12,7 +12,7 @@ "node": ">=18.0.0" }, "name": "outline_sdk_connectivity_test", - "packageManager": "yarn@3.6.1", + "packageManager": "yarn@3.6.4", "private": true, "scripts": { "app_desktop": "yarn workspace app_desktop", diff --git a/x/examples/outline-connectivity-app/shared_backend/package.json b/x/examples/outline-connectivity-app/shared_backend/package.json index 25acb1e3..21a1f814 100644 --- a/x/examples/outline-connectivity-app/shared_backend/package.json +++ b/x/examples/outline-connectivity-app/shared_backend/package.json @@ -6,9 +6,9 @@ "module": "index.ts", "name": "shared_backend", "scripts": { - "build": "concurrently 'yarn:build:*' --kill-others-on-fail", - "build:android": "gomobile bind -target android -androidapi 21 -o output/SharedBackend.aar github.com/Jigsaw-Code/outline-sdk/x/examples/outline-connectivity-app/shared_backend", - "build:ios": "gomobile bind -target ios,iossimulator -o output/SharedBackend.xcframework github.com/Jigsaw-Code/outline-sdk/x/examples/outline-connectivity-app/shared_backend", + "build": "concurrently 'yarn:build:*'", + "build:android": "mkdir -p output; gomobile bind -target android -androidapi 21 -o output/SharedBackend.aar github.com/Jigsaw-Code/outline-sdk/x/examples/outline-connectivity-app/shared_backend", + "build:ios": "mkdir -p output; gomobile bind -target ios,iossimulator -o output/SharedBackend.xcframework github.com/Jigsaw-Code/outline-sdk/x/examples/outline-connectivity-app/shared_backend", "clean": "rm -rf output", "go": "go", "setup": "yarn build",