diff --git a/x/examples/outline-connectivity-app/app_mobile/android/app/build.gradle b/x/examples/outline-connectivity-app/app_mobile/android/app/build.gradle index 5cd1c12e..b76a4d5e 100644 --- a/x/examples/outline-connectivity-app/app_mobile/android/app/build.gradle +++ b/x/examples/outline-connectivity-app/app_mobile/android/app/build.gradle @@ -1,5 +1,18 @@ apply plugin: 'com.android.application' +buildscript { + ext.kotlin_version = '1.5.20' + + repositories { + google() + jcenter() + } + + dependencies { + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + } +} + android { namespace "org.outline.sdk.connectivity" compileSdkVersion rootProject.ext.compileSdkVersion diff --git a/x/examples/outline-connectivity-app/app_mobile/android/app/capacitor.build.gradle b/x/examples/outline-connectivity-app/app_mobile/android/app/capacitor.build.gradle index 40e69700..fc6e01e8 100644 --- a/x/examples/outline-connectivity-app/app_mobile/android/app/capacitor.build.gradle +++ b/x/examples/outline-connectivity-app/app_mobile/android/app/capacitor.build.gradle @@ -1,4 +1,7 @@ -// DO NOT EDIT THIS FILE! IT IS GENERATED EACH TIME "capacitor update" IS RUN +dependencies { + implementation files('../../../shared_backend/output/SharedBackend.aar') + implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.0' +}// DO NOT EDIT THIS FILE! IT IS GENERATED EACH TIME "capacitor update" IS RUN android { compileOptions { @@ -8,12 +11,6 @@ android { } apply from: "../capacitor-cordova-android-plugins/cordova.variables.gradle" -dependencies { - - -implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.0' - implementation files('../../../shared_backend/output/SharedBackend.aar') -} if (hasProperty('postBuildExtras')) { diff --git a/x/examples/outline-connectivity-app/app_mobile/package.json b/x/examples/outline-connectivity-app/app_mobile/package.json index 6b29a431..abab4204 100644 --- a/x/examples/outline-connectivity-app/app_mobile/package.json +++ b/x/examples/outline-connectivity-app/app_mobile/package.json @@ -17,13 +17,16 @@ "name": "app_mobile", "scripts": { "build": "concurrently 'yarn:build:*'", + "build:android": "yarn setup:android && cap build android", "build:frontend": "vite build", "build:ios": "yarn setup:ios && cap build ios", "clean": "rm -rf output node_modules ios/capacitor-cordova-ios-plugins ios/App/App.xcarchive ios/App/App.xcodeproj/xcuserdata ios/App/App.xcworkspace/xcuserdata ios/App/Pods ios/App/App/public ios/App/App/capacitor.config.json ios/App/App/config.xml", + "setup:android": "yarn build:frontend && cap sync android", "setup:ios": "yarn build:frontend && cap sync ios", "watch": "concurrently 'yarn:watch:*'", + "watch:android": "yarn setup:android && cap open android", "watch:frontend": "vite", "watch:ios": "yarn setup:ios && cap open ios" }, "version": "0.0.0" -} +} \ No newline at end of file