Skip to content

Commit

Permalink
Merge pull request #109 from amircybersec/amir-gui-app-setup
Browse files Browse the repository at this point in the history
Several improvements to toolchain setup for GUI app
  • Loading branch information
daniellacosse authored Oct 31, 2023
2 parents c103980 + 72f1ad1 commit 128e48a
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 6 deletions.
10 changes: 10 additions & 0 deletions .gitignore
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
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>
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
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,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
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": "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",
Expand Down

0 comments on commit 128e48a

Please sign in to comment.