From 409780b0c89f2c6cffffe40818f4cd6c1606cb67 Mon Sep 17 00:00:00 2001 From: amir gh Date: Tue, 17 Oct 2023 10:00:57 -0700 Subject: [PATCH 1/8] updated yarn version --- x/examples/outline-connectivity-app/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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", From 209608f7419cbc55fb7bd86cb7c1990920143569 Mon Sep 17 00:00:00 2001 From: amir gh Date: Tue, 17 Oct 2023 10:10:55 -0700 Subject: [PATCH 2/8] mkdir output if not exists & remove concurrently --- .../outline-connectivity-app/shared_backend/package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/x/examples/outline-connectivity-app/shared_backend/package.json b/x/examples/outline-connectivity-app/shared_backend/package.json index 25acb1e3..07a8ea9f 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": "[ ! -d output ] && mkdir 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": "[ ! -d output ] && mkdir 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", From dcdbfa19fccd5499c6ad9f5d34dfb91732f2cb20 Mon Sep 17 00:00:00 2001 From: amir gh Date: Tue, 17 Oct 2023 10:11:21 -0700 Subject: [PATCH 3/8] updated gradle --- .../outline-connectivity-app/app_mobile/android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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" From 2ca18c7bfb94d2a68112818e521ad563e6eeb5bc Mon Sep 17 00:00:00 2001 From: amir gh Date: Tue, 17 Oct 2023 10:12:08 -0700 Subject: [PATCH 4/8] allow app to make http requests (plaintext) --- .../app_mobile/android/app/src/main/AndroidManifest.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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"> + + From ab15bd57f37f6a0193ccf3b9ede6156dd38e9a2e Mon Sep 17 00:00:00 2001 From: amir gh Date: Tue, 17 Oct 2023 09:59:37 -0700 Subject: [PATCH 5/8] add .yarn to gitignore --- .gitignore | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.gitignore b/.gitignore index 9db064af..c759d9a3 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,11 @@ # MacOS files .DS_Store .idea + +.yarn/* +!.yarn/cache +!.yarn/patches +!.yarn/plugins +!.yarn/releases +!.yarn/sdks +!.yarn/versions \ No newline at end of file From d4d5765052274b65fe4e92d3e0860926eaf8b067 Mon Sep 17 00:00:00 2001 From: amir gh Date: Tue, 17 Oct 2023 19:49:46 -0700 Subject: [PATCH 6/8] update .gitignore for yarn --- .gitignore | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index c759d9a3..de567294 100644 --- a/.gitignore +++ b/.gitignore @@ -4,10 +4,12 @@ .DS_Store .idea +# Not using Zero-Installs .yarn/* -!.yarn/cache -!.yarn/patches -!.yarn/plugins !.yarn/releases -!.yarn/sdks -!.yarn/versions \ No newline at end of file +!.yarn/plugins +.pnp.* + +# using Zero Installs +#.yarn/unplugged +#.yarn/build-state.yml \ No newline at end of file From 990c2b5994c3b6a27be97843b310faa9dc274d14 Mon Sep 17 00:00:00 2001 From: amir gh Date: Wed, 25 Oct 2023 10:44:00 -0700 Subject: [PATCH 7/8] fix: add -p flag to mkdir --- .../outline-connectivity-app/shared_backend/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/x/examples/outline-connectivity-app/shared_backend/package.json b/x/examples/outline-connectivity-app/shared_backend/package.json index 07a8ea9f..04d9c321 100644 --- a/x/examples/outline-connectivity-app/shared_backend/package.json +++ b/x/examples/outline-connectivity-app/shared_backend/package.json @@ -7,8 +7,8 @@ "name": "shared_backend", "scripts": { "build": "concurrently 'yarn:build:*'", - "build:android": "[ ! -d output ] && mkdir 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": "[ ! -d output ] && mkdir output; gomobile bind -target ios,iossimulator -o output/SharedBackend.xcframework github.com/Jigsaw-Code/outline-sdk/x/examples/outline-connectivity-app/shared_backend", + "build:android": "[ ! -d output ] && 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": "[ ! -d output ] && 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", From 72f1ad1a53c6d9b8fe033ad975ada93676eddcc4 Mon Sep 17 00:00:00 2001 From: amir gh Date: Thu, 26 Oct 2023 20:20:26 -0700 Subject: [PATCH 8/8] fix: mkdir -p is sufficient --- .../outline-connectivity-app/shared_backend/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/x/examples/outline-connectivity-app/shared_backend/package.json b/x/examples/outline-connectivity-app/shared_backend/package.json index 04d9c321..21a1f814 100644 --- a/x/examples/outline-connectivity-app/shared_backend/package.json +++ b/x/examples/outline-connectivity-app/shared_backend/package.json @@ -7,8 +7,8 @@ "name": "shared_backend", "scripts": { "build": "concurrently 'yarn:build:*'", - "build:android": "[ ! -d output ] && 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": "[ ! -d output ] && 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", + "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",