Resolve "Update Capacitor dependencies to v4"

android/app/build.gradle

@@ -30,6 +30,8 @@ repositories {
 }
 
 dependencies {
+    implementation "androidx.core:core-splashscreen:$coreSplashScreenVersion"
+    implementation "androidx.coordinatorlayout:coordinatorlayout:$androidxCoordinatorLayoutVersion"
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation "androidx.appcompat:appcompat:$androidxAppCompatVersion"
     implementation project(':capacitor-android')

android/app/capacitor.build.gradle

@@ -2,8 +2,8 @@
 
 android {
   compileOptions {
-      sourceCompatibility JavaVersion.VERSION_1_8
+      sourceCompatibility JavaVersion.VERSION_11
-      targetCompatibility JavaVersion.VERSION_1_8
+      targetCompatibility JavaVersion.VERSION_11
   }
 }
 
@@ -20,10 +20,10 @@ dependencies {
     implementation project(':capacitor-keyboard')
     implementation project(':capacitor-local-notifications')
     implementation project(':capacitor-network')
+    implementation project(':capacitor-preferences')
     implementation project(':capacitor-share')
     implementation project(':capacitor-splash-screen')
     implementation project(':capacitor-status-bar')
-    implementation project(':capacitor-storage')
     implementation project(':transistorsoft-capacitor-background-fetch')
     implementation project(':capacitor-secure-storage-plugin')
     implementation "com.android.support:support-v4:27.+"

android/app/proguard-rules.pro

@@ -19,3 +19,6 @@
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
+
+# [capacitor-background-fetch]
+-keep class **BackgroundFetchHeadlessTask { *; }

android/app/src/main/AndroidManifest.xml

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='utf-8'?>
 <manifest package="de.anyschool.app" xmlns:android="http://schemas.android.com/apk/res/android">
     <application android:allowBackup="true" android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/AppTheme" android:usesCleartextTraffic="true">
-        <activity android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|smallestScreenSize|screenLayout|uiMode" android:label="@string/title_activity_main" android:launchMode="singleTask" android:name="de.anyschool.app.MainActivity" android:theme="@style/AppTheme.NoActionBarLaunch">
+        <activity android:exported="true" android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|smallestScreenSize|screenLayout|uiMode" android:label="@string/title_activity_main" android:launchMode="singleTask" android:name="de.anyschool.app.MainActivity" android:theme="@style/AppTheme.NoActionBarLaunch">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />

android/app/src/main/assets/capacitor.plugins.json

@@ -43,6 +43,10 @@
 		"pkg": "@capacitor/network",
 		"classpath": "com.capacitorjs.plugins.network.NetworkPlugin"
 	},
+	{
+		"pkg": "@capacitor/preferences",
+		"classpath": "com.capacitorjs.plugins.preferences.PreferencesPlugin"
+	},
 	{
 		"pkg": "@capacitor/share",
 		"classpath": "com.capacitorjs.plugins.share.SharePlugin"
@@ -55,16 +59,12 @@
 		"pkg": "@capacitor/status-bar",
 		"classpath": "com.capacitorjs.plugins.statusbar.StatusBarPlugin"
 	},
-	{
-		"pkg": "@capacitor/storage",
-		"classpath": "com.capacitorjs.plugins.storage.StoragePlugin"
-	},
 	{
 		"pkg": "@transistorsoft/capacitor-background-fetch",
 		"classpath": "com.transistorsoft.bgfetch.capacitor.BackgroundFetchPlugin"
 	},
 	{
 		"pkg": "capacitor-secure-storage-plugin",
-		"classpath": "com.whitestein.securestorage.SecureStoragePlugin"
+		"classpath": "com.whitestein.securestorage.SecureStoragePluginPlugin"
 	}
 ]

android/app/src/main/res/values/styles.xml

@@ -9,14 +9,14 @@
         <item name="colorAccent">@color/colorAccent</item>
     </style>
 
-    <style name="AppTheme.NoActionBar" parent="Theme.AppCompat.NoActionBar">
+    <style name="AppTheme.NoActionBar" parent="Theme.AppCompat.DayNight.NoActionBar">
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
         <item name="android:background">@null</item>
     </style>
 
 
-    <style name="AppTheme.NoActionBarLaunch" parent="AppTheme.NoActionBar">
+    <style name="AppTheme.NoActionBarLaunch" parent="Theme.SplashScreen">
         <item name="android:background">@drawable/splash</item>
     </style>
 </resources>

android/build.gradle

@@ -4,11 +4,11 @@ buildscript {
     
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.3'
+        classpath 'com.android.tools.build:gradle:7.2.1'
-        classpath 'com.google.gms:google-services:4.3.5'
+        classpath 'com.google.gms:google-services:4.3.13'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -20,7 +20,7 @@ apply from: "variables.gradle"
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
         // https://github.com/transistorsoft/capacitor-background-fetch/blob/master/example/android/build.gradle
         maven {
             url("${project(':transistorsoft-capacitor-background-fetch').projectDir}/libs")

android/capacitor.settings.gradle

@@ -35,6 +35,9 @@ project(':capacitor-local-notifications').projectDir = new File('../node_modules
 include ':capacitor-network'
 project(':capacitor-network').projectDir = new File('../node_modules/@capacitor/network/android')
 
+include ':capacitor-preferences'
+project(':capacitor-preferences').projectDir = new File('../node_modules/@capacitor/preferences/android')
+
 include ':capacitor-share'
 project(':capacitor-share').projectDir = new File('../node_modules/@capacitor/share/android')
 
@@ -44,9 +47,6 @@ project(':capacitor-splash-screen').projectDir = new File('../node_modules/@capa
 include ':capacitor-status-bar'
 project(':capacitor-status-bar').projectDir = new File('../node_modules/@capacitor/status-bar/android')
 
-include ':capacitor-storage'
-project(':capacitor-storage').projectDir = new File('../node_modules/@capacitor/storage/android')
-
 include ':transistorsoft-capacitor-background-fetch'
 project(':transistorsoft-capacitor-background-fetch').projectDir = new File('../node_modules/@transistorsoft/capacitor-background-fetch/android')
 

android/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

android/variables.gradle

@@ -1,14 +1,16 @@
 ext {
-    minSdkVersion = 21
+    minSdkVersion = 22
-    compileSdkVersion = 30
+    compileSdkVersion = 32
-    targetSdkVersion = 30
+    targetSdkVersion = 32
-    androidxActivityVersion = '1.2.0'
+    androidxActivityVersion = '1.4.0'
-    androidxAppCompatVersion = '1.2.0'
+    androidxAppCompatVersion = '1.4.2'
-    androidxCoordinatorLayoutVersion = '1.1.0'
+    androidxCoordinatorLayoutVersion = '1.2.0'
-    androidxCoreVersion = '1.3.2'
+    androidxCoreVersion = '1.8.0'
-    androidxFragmentVersion = '1.3.0'
+    androidxFragmentVersion = '1.4.1'
-    junitVersion = '4.13.1'
+    junitVersion = '4.13.2'
-    androidxJunitVersion = '1.1.2'
+    androidxJunitVersion = '1.1.3'
-    androidxEspressoCoreVersion = '3.3.0'
+    androidxEspressoCoreVersion = '3.4.0'
-    cordovaAndroidVersion = '7.0.0'
+    cordovaAndroidVersion = '10.1.1'
+    coreSplashScreenVersion = '1.0.0-rc01'
+    androidxWebkitVersion = '1.4.0'
 }

ios/App/App.xcodeproj/project.pbxproj

@@ -283,7 +283,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -334,7 +334,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
@@ -352,7 +352,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = QN788YUV45;
 				INFOPLIST_FILE = App/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
 				PRODUCT_BUNDLE_IDENTIFIER = de.anyschool.app;
@@ -374,7 +374,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = QN788YUV45;
 				INFOPLIST_FILE = App/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = de.anyschool.app;
 				PRODUCT_NAME = "$(TARGET_NAME)";

ios/App/App/AppDelegate.swift

@@ -56,15 +56,4 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         return ApplicationDelegateProxy.shared.application(application, continue: userActivity, restorationHandler: restorationHandler)
     }
 
-    override func touchesBegan(_ touches: Set<UITouch>, with event: UIEvent?) {
-        super.touchesBegan(touches, with: event)
-
-        let statusBarRect = UIApplication.shared.statusBarFrame
-        guard let touchPoint = event?.allTouches?.first?.location(in: self.window) else { return }
-
-        if statusBarRect.contains(touchPoint) {
-            NotificationCenter.default.post(name: .capacitorStatusBarTapped, object: nil)
-        }
-    }
-
 }

ios/App/App/Info.plist

@@ -6,10 +6,6 @@
 	<array>
 		<string>com.transistorsoft.fetch</string>
 	</array>
-	<key>NSCalendarsUsageDescription</key>
-	<string>Calendar access is needed to sync your schedule with the device</string>
-	<key>NSLocationWhenInUseUsageDescription</key>
-	<string>Location services are used to enable all map and search features</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleDisplayName</key>
@@ -44,11 +40,14 @@
 	<string>1</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
-	<key>NSAppTransportSecurity</key>
+	<key>NSCalendarsUsageDescription</key>
-	<dict>
+	<string>Calendar access is needed to sync your schedule with the device</string>
-		<key>NSAllowsArbitraryLoads</key>
+	<key>NSLocationWhenInUseUsageDescription</key>
-		<true/>
+	<string>Location services are used to enable all map and search features</string>
-	</dict>
+	<key>UIBackgroundModes</key>
+	<array>
+		<string>fetch</string>
+	</array>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
 	<key>UIMainStoryboardFile</key>

ios/App/App/capacitor.config.json

@@ -26,8 +26,5 @@
 			"useDialog": false
 		},
 		"LocalNotifications": {}
-	},
-	"server": {
-		"url": "http://localhost:8100"
 	}
 }

ios/App/Podfile

@@ -1,4 +1,6 @@
-platform :ios, '12.0'
+require_relative '../../node_modules/@capacitor/ios/scripts/pods_helpers'
+
+platform :ios, '13.0'
 use_frameworks!
 
 # workaround to avoid Xcode caching of Pods that requires
@@ -20,10 +22,10 @@ def capacitor_pods
   pod 'CapacitorKeyboard', :path => '../../node_modules/@capacitor/keyboard'
   pod 'CapacitorLocalNotifications', :path => '../../node_modules/@capacitor/local-notifications'
   pod 'CapacitorNetwork', :path => '../../node_modules/@capacitor/network'
+  pod 'CapacitorPreferences', :path => '../../node_modules/@capacitor/preferences'
   pod 'CapacitorShare', :path => '../../node_modules/@capacitor/share'
   pod 'CapacitorSplashScreen', :path => '../../node_modules/@capacitor/splash-screen'
   pod 'CapacitorStatusBar', :path => '../../node_modules/@capacitor/status-bar'
-  pod 'CapacitorStorage', :path => '../../node_modules/@capacitor/storage'
   pod 'TransistorsoftCapacitorBackgroundFetch', :path => '../../node_modules/@transistorsoft/capacitor-background-fetch'
   pod 'CapacitorSecureStoragePlugin', :path => '../../node_modules/capacitor-secure-storage-plugin'
   pod 'CordovaPlugins', :path => '../capacitor-cordova-ios-plugins'
@@ -33,3 +35,8 @@ target 'App' do
   capacitor_pods
   # Add your Pods here
 end
+
+
+post_install do |installer|
+  assertDeploymentTarget(installer)
+end

package.json

@@ -64,32 +64,32 @@
     "@awesome-cordova-plugins/calendar": "5.44.0",
     "@awesome-cordova-plugins/core": "5.44.0",
     "@capacitor-community/http": "1.4.1",
-    "@capacitor/app": "1.1.1",
+    "@capacitor/app": "4.0.1",
-    "@capacitor/browser": "1.0.7",
+    "@capacitor/browser": "4.0.1",
-    "@capacitor/core": "3.5.1",
+    "@capacitor/core": "4.1.0",
-    "@capacitor/device": "1.1.2",
+    "@capacitor/device": "4.0.1",
-    "@capacitor/dialog": "1.0.7",
+    "@capacitor/dialog": "4.0.1",
-    "@capacitor/filesystem": "1.1.0",
+    "@capacitor/filesystem": "4.1.0",
-    "@capacitor/geolocation": "1.3.1",
+    "@capacitor/geolocation": "4.0.1",
-    "@capacitor/haptics": "1.1.4",
+    "@capacitor/haptics": "4.0.1",
-    "@capacitor/keyboard": "1.2.2",
+    "@capacitor/keyboard": "4.0.1",
-    "@capacitor/local-notifications": "1.1.0",
+    "@capacitor/local-notifications": "4.0.1",
-    "@capacitor/network": "1.0.7",
+    "@capacitor/network": "4.0.1",
-    "@capacitor/share": "1.1.2",
+    "@capacitor/preferences": "4.0.1",
-    "@capacitor/splash-screen": "1.2.2",
+    "@capacitor/share": "4.0.1",
-    "@capacitor/status-bar": "1.0.8",
+    "@capacitor/splash-screen": "4.0.1",
-    "@capacitor/storage": "1.2.5",
+    "@capacitor/status-bar": "4.0.1",
     "@ionic-native/core": "5.36.0",
     "@ionic-native/file-opener": "5.36.0",
-    "@ionic/angular": "6.2.3",
+    "@ionic/angular": "6.2.4",
     "@ionic/storage-angular": "3.0.6",
     "@ngx-translate/core": "14.0.0",
     "@ngx-translate/http-loader": "7.0.0",
-    "@openstapps/api": "0.42.0",
+    "@openstapps/api": "0.43.0",
     "@openstapps/configuration": "0.33.0",
     "@openstapps/core": "0.69.0",
-    "@transistorsoft/capacitor-background-fetch": "0.0.6",
+    "@transistorsoft/capacitor-background-fetch": "1.0.0",
-    "capacitor-secure-storage-plugin": "0.7.1",
+    "capacitor-secure-storage-plugin": "0.8.0",
     "cordova-plugin-calendar": "5.1.6",
     "cordova-plugin-file-opener2": "3.0.5",
     "deepmerge": "4.2.2",
@@ -124,27 +124,27 @@
     "@angular/compiler": "13.3.11",
     "@angular/compiler-cli": "13.3.11",
     "@angular/language-service": "13.3.11",
-    "@capacitor/android": "3.5.1",
+    "@capacitor/android": "4.1.0",
-    "@capacitor/cli": "3.5.1",
+    "@capacitor/cli": "4.1.0",
-    "@capacitor/ios": "3.5.1",
+    "@capacitor/ios": "4.1.0",
     "@compodoc/compodoc": "1.1.19",
     "@cypress/schematic": "1.7.0",
     "@ionic/angular-toolkit": "6.1.0",
     "@ionic/cli": "6.20.1",
     "@types/fontkit": "1.8.0",
     "@types/glob": "7.2.0",
-    "@types/jasmine": "4.0.3",
+    "@types/jasmine": "4.3.0",
     "@types/jasminewd2": "2.0.10",
     "@types/jsonpath": "0.2.0",
     "@types/leaflet": "1.7.11",
     "@types/leaflet.markercluster": "1.5.1",
     "@types/node": "14.18.24",
-    "@typescript-eslint/eslint-plugin": "5.33.1",
+    "@typescript-eslint/eslint-plugin": "5.35.1",
-    "@typescript-eslint/parser": "5.33.1",
+    "@typescript-eslint/parser": "5.35.1",
     "conventional-changelog-cli": "2.2.2",
     "cordova-res": "0.15.4",
     "cypress": "10.6.0",
-    "eslint": "8.22.0",
+    "eslint": "8.23.0",
     "eslint-config-prettier": "8.5.0",
     "eslint-plugin-jsdoc": "39.3.6",
     "eslint-plugin-prettier": "4.2.1",