Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Several improvements to toolchain setup for GUI app #109

Merged
merged 8 commits into from
Oct 31, 2023
Merged

Several improvements to toolchain setup for GUI app #109

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
409780b
updated yarn version
amircybersec Oct 17, 2023
209608f
mkdir output if not exists & remove concurrently
amircybersec Oct 17, 2023
dcdbfa1
updated gradle
amircybersec Oct 17, 2023
2ca18c7
allow app to make http requests (plaintext)
amircybersec Oct 17, 2023
ab15bd5
add .yarn to gitignore
amircybersec Oct 17, 2023
d4d5765
update .gitignore for yarn
amircybersec Oct 18, 2023
990c2b5
fix: add -p flag to mkdir
amircybersec Oct 25, 2023
72f1ad1
fix: mkdir -p is sufficient
amircybersec Oct 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions .gitignore
View file
Open in desktop
amircybersec marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -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
5 changes: 4 additions & 1 deletion x/examples/outline-connectivity-app/app_mobile/android/app/src/main/AndroidManifest.xml
View file
Open in desktop
amircybersec marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -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">


<activity
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|smallestScreenSize|screenLayout|uiMode"
Expand Down Expand Up @@ -38,4 +40,5 @@
<!-- Permissions -->

<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
</manifest>
2 changes: 1 addition & 1 deletion x/examples/outline-connectivity-app/app_mobile/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion x/examples/outline-connectivity-app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"node": ">=18.0.0"
},
"name": "outline_sdk_connectivity_test",
"packageManager": "[email protected].1",
"packageManager": "[email protected].4",
"private": true,
"scripts": {
"app_desktop": "yarn workspace app_desktop",
Expand Down
6 changes: 3 additions & 3 deletions x/examples/outline-connectivity-app/shared_backend/package.json
View file
Open in desktop
amircybersec marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down