From 1da8a8ef521a4c2afb30d5b664b0330e8a9a23f7 Mon Sep 17 00:00:00 2001 From: Noel Light-Hilary Date: Mon, 14 Nov 2022 12:34:41 +0000 Subject: [PATCH] Update Capacitor + Java metadata stuff --- android/app/capacitor.build.gradle | 5 ++-- .../src/main/assets/capacitor.plugins.json | 24 +++++++++++++++++-- android/capacitor.settings.gradle | 3 --- doc/Development.md | 1 - .../xcshareddata/WorkspaceSettings.xcsettings | 8 +++++++ 5 files changed, 32 insertions(+), 9 deletions(-) create mode 100644 ios/App/App.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings diff --git a/android/app/capacitor.build.gradle b/android/app/capacitor.build.gradle index 9c6ca66..ef1a4cc 100644 --- a/android/app/capacitor.build.gradle +++ b/android/app/capacitor.build.gradle @@ -2,8 +2,8 @@ android { compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_11 + targetCompatibility JavaVersion.VERSION_11 } } @@ -16,7 +16,6 @@ dependencies { implementation project(':capacitor-haptics') implementation project(':capacitor-keyboard') implementation project(':capacitor-status-bar') - implementation project(':robingenz-capacitor-android-dark-mode-support') } diff --git a/android/app/src/main/assets/capacitor.plugins.json b/android/app/src/main/assets/capacitor.plugins.json index e67af20..7518789 100644 --- a/android/app/src/main/assets/capacitor.plugins.json +++ b/android/app/src/main/assets/capacitor.plugins.json @@ -4,7 +4,27 @@ "classpath": "com.getcapacitor.community.database.sqlite.CapacitorSQLitePlugin" }, { - "pkg": "@robingenz/capacitor-android-dark-mode-support", - "classpath": "dev.robingenz.capacitor.androiddarkmodesupport.AndroidDarkModeSupportPlugin" + "pkg": "@capacitor/app", + "classpath": "com.capacitorjs.plugins.app.AppPlugin" + }, + { + "pkg": "@capacitor/browser", + "classpath": "com.capacitorjs.plugins.browser.BrowserPlugin" + }, + { + "pkg": "@capacitor/clipboard", + "classpath": "com.capacitorjs.plugins.clipboard.ClipboardPlugin" + }, + { + "pkg": "@capacitor/haptics", + "classpath": "com.capacitorjs.plugins.haptics.HapticsPlugin" + }, + { + "pkg": "@capacitor/keyboard", + "classpath": "com.capacitorjs.plugins.keyboard.KeyboardPlugin" + }, + { + "pkg": "@capacitor/status-bar", + "classpath": "com.capacitorjs.plugins.statusbar.StatusBarPlugin" } ] diff --git a/android/capacitor.settings.gradle b/android/capacitor.settings.gradle index 598474e..c4b5ead 100644 --- a/android/capacitor.settings.gradle +++ b/android/capacitor.settings.gradle @@ -22,6 +22,3 @@ project(':capacitor-keyboard').projectDir = new File('../node_modules/@capacitor include ':capacitor-status-bar' project(':capacitor-status-bar').projectDir = new File('../node_modules/@capacitor/status-bar/android') - -include ':robingenz-capacitor-android-dark-mode-support' -project(':robingenz-capacitor-android-dark-mode-support').projectDir = new File('../node_modules/@robingenz/capacitor-android-dark-mode-support/android') diff --git a/doc/Development.md b/doc/Development.md index ce37ef8..4436e9b 100644 --- a/doc/Development.md +++ b/doc/Development.md @@ -43,7 +43,6 @@ Java 11). If these things are not true, adjust or delete the `JAVA_HOME` var as ### iOS -* See [this answer re build system flag](https://stackoverflow.com/a/52432058/2803757) - change in Xcode before build if necessary. * Set new `CURRENT_PROJECT_VERSION` and `MARKETING_VERSION` in [ios/App/App.xcodeproj/project.pbxproj](../ios/App/App.xcodeproj/project.pbxproj) * `ionic capacitor build ios --prod` * Open `ios/App/App.xcworkspace` in Xcode, or let Capacitor do this for you diff --git a/ios/App/App.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/ios/App/App.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings new file mode 100644 index 0000000..f9b0d7c --- /dev/null +++ b/ios/App/App.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings @@ -0,0 +1,8 @@ + + + + + PreviewsEnabled + + +