feat: updata capacitor to 7, getting rid of outdated plugins, target sdk 35, bypass edge to edge requirement for now

manuelsc · manuelsc · commit 0c6a7c4ea5d5 · 2025-07-02T13:59:12.000+02:00
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -20,14 +20,6 @@ android {
         }
     }
 
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_17
-    }
-
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_17.toString()
-    }
 
     flavorDimensions += "environment"
     productFlavors {
diff --git a/android/app/capacitor.build.gradle b/android/app/capacitor.build.gradle
@@ -2,8 +2,8 @@
 
 android {
   compileOptions {
-      sourceCompatibility JavaVersion.VERSION_17
-      targetCompatibility JavaVersion.VERSION_17
+      sourceCompatibility JavaVersion.VERSION_21
+      targetCompatibility JavaVersion.VERSION_21
   }
 }
 
@@ -22,9 +22,10 @@ dependencies {
     implementation project(':capacitor-splash-screen')
     implementation project(':capacitor-status-bar')
     implementation project(':capacitor-toast')
-    implementation project(':capacitor-navigationbarnx')
+    implementation project(':capawesome-capacitor-android-edge-to-edge-support')
+    implementation project(':capgo-capacitor-navigation-bar')
     implementation project(':storage-mirror')
-    implementation "com.android.billingclient:billing:7.0.0"
+    implementation "com.android.billingclient:billing:7.1.1"
 }
 
 
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -5,7 +5,7 @@
     <uses-permission android:name="android.permission.VIBRATE" />
     <application android:allowBackup="true" android:icon="@mipmap/ic_launcher_round" android:label="${appLabel}" android:roundIcon="@mipmap/ic_launcher_round" android:supportsPictureInPicture="false" android:supportsRtl="true" android:theme="@style/AppTheme" android:usesCleartextTraffic="true">
         <meta-data android:name="com.google.android.gms.ads.APPLICATION_ID" android:value="@string/admob_app_id" />
-        <activity android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|smallestScreenSize|screenLayout|uiMode" android:exported="true" android:label="${appLabel}" android:launchMode="singleTask" android:name=".MainActivity" android:theme="@style/AppTheme.NoActionBarLaunch">
+        <activity android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|smallestScreenSize|screenLayout|uiMode|navigation" android:exported="true" android:label="${appLabel}" android:launchMode="singleTask" android:name=".MainActivity" android:theme="@style/AppTheme.NoActionBarLaunch">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
diff --git a/android/app/src/main/assets/capacitor.config.json b/android/app/src/main/assets/capacitor.config.json
@@ -14,7 +14,8 @@
 		}
 	},
 	"android": {
-		"flavor": "prod"
+		"flavor": "prod",
+		"adjustMarginsForEdgeToEdge": "disabled"
 	},
 	"server": {
 		"androidScheme": "http"
diff --git a/android/app/src/main/assets/capacitor.plugins.json b/android/app/src/main/assets/capacitor.plugins.json
@@ -52,8 +52,12 @@
 		"classpath": "com.capacitorjs.plugins.toast.ToastPlugin"
 	},
 	{
-		"pkg": "capacitor-navigationbarnx",
-		"classpath": "com.nikosdouvlis.navigationbar.NavigationBar"
+		"pkg": "@capawesome/capacitor-android-edge-to-edge-support",
+		"classpath": "io.capawesome.capacitorjs.plugins.androidedgetoedgesupport.EdgeToEdgePlugin"
+	},
+	{
+		"pkg": "@capgo/capacitor-navigation-bar",
+		"classpath": "ee.forgr.capacitor_navigation_bar.NavigationBarPlugin"
 	},
 	{
 		"pkg": "storage-mirror",
diff --git a/android/app/src/main/res/values-v31/styles.xml b/android/app/src/main/res/values-v31/styles.xml
@@ -23,6 +23,7 @@
     <style name="AppTheme.NoActionBarLaunch" parent="Theme.SplashScreen">
         <item name="windowSplashScreenBackground">@color/splashscreenbg</item>
         <item name="windowSplashScreenAnimatedIcon">@mipmap/ic_launcher_round</item>
+        <item name="android:windowOptOutEdgeToEdgeEnforcement">true</item>
     </style>
 
 </resources>
diff --git a/android/app/src/main/res/values-v35/styles.xml b/android/app/src/main/res/values-v35/styles.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="AppTheme.NoActionBarLaunch" parent="Theme.SplashScreen">
+        <item name="windowSplashScreenBackground">@color/splashscreenbg</item>
+        <item name="windowSplashScreenAnimatedIcon">@mipmap/ic_launcher_round</item>
+        <item name="android:windowOptOutEdgeToEdgeEnforcement">true</item>
+    </style>
+</resources>
diff --git a/android/build.gradle b/android/build.gradle
@@ -1,16 +1,16 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.8.0'
+    ext.kotlin_version = '1.9.25'
 
     repositories {
         google()
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.8.2'
+        classpath 'com.android.tools.build:gradle:8.7.2'
         if (!getGradle().getStartParameter().getTaskRequests().toString().contains("Nogoogle")) {
-            classpath 'com.google.gms:google-services:4.4.0'
+            classpath 'com.google.gms:google-services:4.4.2'
         }
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
diff --git a/android/capacitor.settings.gradle b/android/capacitor.settings.gradle
@@ -41,8 +41,11 @@ project(':capacitor-status-bar').projectDir = new File('../node_modules/@capacit
 include ':capacitor-toast'
 project(':capacitor-toast').projectDir = new File('../node_modules/@capacitor/toast/android')
 
-include ':capacitor-navigationbarnx'
-project(':capacitor-navigationbarnx').projectDir = new File('../node_modules/capacitor-navigationbarnx/android')
+include ':capawesome-capacitor-android-edge-to-edge-support'
+project(':capawesome-capacitor-android-edge-to-edge-support').projectDir = new File('../node_modules/@capawesome/capacitor-android-edge-to-edge-support/android')
+
+include ':capgo-capacitor-navigation-bar'
+project(':capgo-capacitor-navigation-bar').projectDir = new File('../node_modules/@capgo/capacitor-navigation-bar/android')
 
 include ':storage-mirror'
 project(':storage-mirror').projectDir = new File('../storage-mirror/android')
diff --git a/android/gradle/wrapper/gradle-wrapper.jar b/android/gradle/wrapper/gradle-wrapper.jar
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/android/gradlew b/android/gradlew
diff --git a/android/gradlew.bat b/android/gradlew.bat
diff --git a/android/variables.gradle b/android/variables.gradle
@@ -1,17 +1,17 @@
 ext {
-    minSdkVersion = 22
-    compileSdkVersion = 34
-    targetSdkVersion = 34
-    androidxActivityVersion = '1.8.0'
-    androidxAppCompatVersion = '1.6.1'
+    minSdkVersion = 23
+    compileSdkVersion = 35
+    targetSdkVersion = 35
+    androidxActivityVersion = '1.9.2'
+    androidxAppCompatVersion = '1.7.0'
     androidxCoordinatorLayoutVersion = '1.2.0'
-    androidxCoreVersion = '1.12.0'
-    androidxFragmentVersion = '1.6.2'
+    androidxCoreVersion = '1.15.0'
+    androidxFragmentVersion = '1.8.4'
     coreSplashScreenVersion = '1.0.1'
-    androidxWebkitVersion = '1.9.0'
+    androidxWebkitVersion = '1.12.1'
     junitVersion = '4.13.2'
-    androidxJunitVersion = '1.1.5'
-    androidxEspressoCoreVersion = '3.5.1'
+    androidxJunitVersion = '1.2.1'
+    androidxEspressoCoreVersion = '3.6.1'
     cordovaAndroidVersion = '10.1.1'
-    //firebaseMessagingVersion = '23.3.1'
+    //firebaseMessagingVersion = '24.1.0'
 }
diff --git a/capacitor.config.json b/capacitor.config.json
@@ -14,7 +14,8 @@
 		}
 	},
 	"android": {
-		"flavor": "prod"
+		"flavor": "prod",
+		"adjustMarginsForEdgeToEdge": "disabled"
 	},
 	"server": {
 		"androidScheme": "http"
diff --git a/ios/App/App.xcodeproj/project.pbxproj b/ios/App/App.xcodeproj/project.pbxproj
@@ -430,7 +430,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -485,7 +485,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_COMPILATION_MODE = wholemodule;
@@ -507,7 +507,7 @@
 				CURRENT_PROJECT_VERSION = 116;
 				DEVELOPMENT_TEAM = M6RLJ8D785;
 				INFOPLIST_FILE = App/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -538,7 +538,7 @@
 				CURRENT_PROJECT_VERSION = 116;
 				DEVELOPMENT_TEAM = M6RLJ8D785;
 				INFOPLIST_FILE = App/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
diff --git a/ios/App/Podfile b/ios/App/Podfile
@@ -1,6 +1,6 @@
 require_relative '../../node_modules/@capacitor/ios/scripts/pods_helpers'
 
-platform :ios, '13.0'
+platform :ios, '14.0'
 use_frameworks!
 
 # workaround to avoid Xcode caching of Pods that requires
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
diff --git a/src/app/utils/ThemeUtils.ts b/src/app/utils/ThemeUtils.ts
diff --git a/storage-mirror/android/variables.gradle b/storage-mirror/android/variables.gradle

Original file line number	Diff line number	Diff line change
`@@ -20,14 +20,6 @@ android {`
`20`	`20`	`}`
`21`	`21`	`}`
`22`	`22`
`23`		`- compileOptions {`
`24`		`- sourceCompatibility JavaVersion.VERSION_17`
`25`		`- targetCompatibility JavaVersion.VERSION_17`
`26`		`- }`
`27`		`-`
`28`		`- kotlinOptions {`
`29`		`- jvmTarget = JavaVersion.VERSION_17.toString()`
`30`		`- }`
`31`	`23`
`32`	`24`	`flavorDimensions += "environment"`
`33`	`25`	`productFlavors {`
Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,8 @@`
`2`	`2`
`3`	`3`	`android {`
`4`	`4`	`compileOptions {`
`5`		`- sourceCompatibility JavaVersion.VERSION_17`
`6`		`- targetCompatibility JavaVersion.VERSION_17`
	`5`	`+ sourceCompatibility JavaVersion.VERSION_21`
	`6`	`+ targetCompatibility JavaVersion.VERSION_21`
`7`	`7`	`}`
`8`	`8`	`}`
`9`	`9`
`@@ -22,9 +22,10 @@ dependencies {`
`22`	`22`	`implementation project(':capacitor-splash-screen')`
`23`	`23`	`implementation project(':capacitor-status-bar')`
`24`	`24`	`implementation project(':capacitor-toast')`
`25`		`- implementation project(':capacitor-navigationbarnx')`
	`25`	`+ implementation project(':capawesome-capacitor-android-edge-to-edge-support')`
	`26`	`+ implementation project(':capgo-capacitor-navigation-bar')`
`26`	`27`	`implementation project(':storage-mirror')`
`27`		`- implementation "com.android.billingclient:billing:7.0.0"`
	`28`	`+ implementation "com.android.billingclient:billing:7.1.1"`
`28`	`29`	`}`
`29`	`30`
`30`	`31`