Skip to content

Commit f1e3606

Browse files
robingenzrobingenz
committed
feat!: update to Capacitor 7
1 parent e61d907 commit f1e3606

File tree

17 files changed

+307
-614
lines changed

17 files changed

+307
-614
lines changed

‎android/.idea/other.xml‎

Lines changed: 0 additions & 263 deletions
This file was deleted.

‎android/app/capacitor.build.gradle‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
android {
44
compileOptions {
5-
sourceCompatibility JavaVersion.VERSION_17
6-
targetCompatibility JavaVersion.VERSION_17
5+
sourceCompatibility JavaVersion.VERSION_21
6+
targetCompatibility JavaVersion.VERSION_21
77
}
88
}
99

@@ -19,6 +19,7 @@ dependencies {
1919
implementation project(':capacitor-status-bar')
2020
implementation project(':capawesome-team-capacitor-file-opener')
2121
implementation project(':capawesome-team-capacitor-nfc')
22+
implementation project(':capawesome-capacitor-android-edge-to-edge-support')
2223

2324
}
2425

‎android/app/src/main/AndroidManifest.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
<activity
1414
android:exported="true"
15-
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|smallestScreenSize|screenLayout|uiMode"
15+
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|smallestScreenSize|screenLayout|uiMode|navigation"
1616
android:name="de.dhbw.vs.standortapp.MainActivity"
1717
android:label="@string/title_activity_main"
1818
android:theme="@style/AppTheme.NoActionBarLaunch"

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,5 +38,9 @@
3838
{
3939
"pkg": "@capawesome-team/capacitor-nfc",
4040
"classpath": "io.capawesome.capacitorjs.plugins.nfc.NfcPlugin"
41+
},
42+
{
43+
"pkg": "@capawesome/capacitor-android-edge-to-edge-support",
44+
"classpath": "io.capawesome.capacitorjs.plugins.androidedgetoedgesupport.EdgeToEdgePlugin"
4145
}
4246
]

‎android/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ buildscript {
77
mavenCentral()
88
}
99
dependencies {
10-
classpath 'com.android.tools.build:gradle:8.2.1'
11-
classpath 'com.google.gms:google-services:4.4.0'
10+
classpath 'com.android.tools.build:gradle:8.7.2'
11+
classpath 'com.google.gms:google-services:4.4.2'
1212

1313
// NOTE: Do not place your application dependencies here; they belong
1414
// in the individual module build.gradle files

‎android/capacitor.settings.gradle‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,6 @@ project(':capawesome-team-capacitor-file-opener').projectDir = new File('../node
3131

3232
include ':capawesome-team-capacitor-nfc'
3333
project(':capawesome-team-capacitor-nfc').projectDir = new File('../node_modules/@capawesome-team/capacitor-nfc/android')
34+
35+
include ':capawesome-capacitor-android-edge-to-edge-support'
36+
project(':capawesome-capacitor-android-edge-to-edge-support').projectDir = new File('../node_modules/@capawesome/capacitor-android-edge-to-edge-support/android')

‎android/gradle/wrapper/gradle-wrapper.jar‎

-15.3 KB
Binary file not shown.

‎android/gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip
4+
networkTimeout=10000
5+
validateDistributionUrl=true
46
zipStoreBase=GRADLE_USER_HOME
57
zipStorePath=wrapper/dists

‎android/variables.gradle‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
ext {
2-
minSdkVersion = 22
3-
compileSdkVersion = 34
4-
targetSdkVersion = 34
5-
androidxActivityVersion = '1.8.0'
6-
androidxAppCompatVersion = '1.6.1'
2+
minSdkVersion = 23
3+
compileSdkVersion = 35
4+
targetSdkVersion = 35
5+
androidxActivityVersion = '1.9.2'
6+
androidxAppCompatVersion = '1.7.0'
77
androidxCoordinatorLayoutVersion = '1.2.0'
8-
androidxCoreVersion = '1.12.0'
9-
androidxFragmentVersion = '1.6.2'
8+
androidxCoreVersion = '1.15.0'
9+
androidxFragmentVersion = '1.8.4'
1010
junitVersion = '4.13.2'
11-
androidxJunitVersion = '1.1.5'
12-
androidxEspressoCoreVersion = '3.5.1'
11+
androidxJunitVersion = '1.2.1'
12+
androidxEspressoCoreVersion = '3.6.1'
1313
cordovaAndroidVersion = '10.1.1'
1414
coreSplashScreenVersion = '1.0.1'
15-
androidxWebkitVersion = '1.9.0'
15+
androidxWebkitVersion = '1.12.1'
1616
}

‎ios/App/App.xcodeproj/project.pbxproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@
283283
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
284284
GCC_WARN_UNUSED_FUNCTION = YES;
285285
GCC_WARN_UNUSED_VARIABLE = YES;
286-
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
286+
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
287287
MTL_ENABLE_DEBUG_INFO = YES;
288288
ONLY_ACTIVE_ARCH = YES;
289289
SDKROOT = iphoneos;
@@ -334,7 +334,7 @@
334334
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
335335
GCC_WARN_UNUSED_FUNCTION = YES;
336336
GCC_WARN_UNUSED_VARIABLE = YES;
337-
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
337+
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
338338
MTL_ENABLE_DEBUG_INFO = NO;
339339
SDKROOT = iphoneos;
340340
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
@@ -354,7 +354,7 @@
354354
DEVELOPMENT_TEAM = U73Q28Z596;
355355
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = U73Q28Z596;
356356
INFOPLIST_FILE = App/Info.plist;
357-
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
357+
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
358358
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
359359
OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
360360
PRODUCT_BUNDLE_IDENTIFIER = de.dhbw.vs.standortapp;
@@ -379,7 +379,7 @@
379379
DEVELOPMENT_TEAM = U73Q28Z596;
380380
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = U73Q28Z596;
381381
INFOPLIST_FILE = App/Info.plist;
382-
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
382+
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
383383
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
384384
PRODUCT_BUNDLE_IDENTIFIER = de.dhbw.vs.standortapp;
385385
PRODUCT_NAME = "$(TARGET_NAME)";

0 commit comments

Comments
 (0)