Skip to content

Commit 0da0374

Browse files
authored
chore: Update testapp for Capacitor 7 (#664)
* chore: Add 6.0.0 and 7.0.0 as valid * chore: just support Cap 7 * chore: update Podfile to iOS 14 minimum * chore: update project.pbxproj to iOS 14.0 min * chore: `npx cap migrate` for Capacitor 7 * chore: fix migrate to 7.0.0 * chore: update cap to 7.0.1 and plugins to 7.0.0
1 parent 2dc00f3 commit 0da0374

13 files changed

Lines changed: 2823 additions & 2104 deletions

File tree

android/app/capacitor.build.gradle

Lines changed: 2 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

android/app/src/main/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
android:theme="@style/AppTheme">
1212

1313
<activity
14-
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|smallestScreenSize|screenLayout|uiMode"
14+
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|smallestScreenSize|screenLayout|uiMode|navigation"
1515
android:name="com.capacitorjs.app.testapp.MainActivity"
1616
android:label="@string/title_activity_main"
1717
android:theme="@style/AppTheme.NoActionBarLaunch"

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
-19.3 KB
Binary file not shown.

android/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
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
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

android/gradlew

Lines changed: 13 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

android/gradlew.bat

Lines changed: 12 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

android/variables.gradle

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
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-
androidxBrowserVersion = '1.7.0'
10-
androidxFragmentVersion = '1.6.2'
11-
androidxMaterialVersion = '1.10.0'
12-
androidxExifInterfaceVersion = '1.3.6'
13-
firebaseMessagingVersion = '23.3.1'
14-
playServicesLocationVersion = '21.1.0'
8+
androidxCoreVersion = '1.15.0'
9+
androidxBrowserVersion = '1.8.0'
10+
androidxFragmentVersion = '1.8.4'
11+
androidxMaterialVersion = '1.12.0'
12+
androidxExifInterfaceVersion = '1.3.7'
13+
firebaseMessagingVersion = '24.1.0'
14+
playServicesLocationVersion = '21.3.0'
1515
junitVersion = '4.13.2'
16-
androidxJunitVersion = '1.1.5'
17-
androidxEspressoCoreVersion = '3.5.1'
16+
androidxJunitVersion = '1.2.1'
17+
androidxEspressoCoreVersion = '3.6.1'
1818
cordovaAndroidVersion = '10.1.1'
1919
coreSplashScreenVersion = '1.0.1'
20-
androidxWebkitVersion = '1.9.0'
20+
androidxWebkitVersion = '1.12.1'
2121
}

ios/App/App.xcodeproj/project.pbxproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@
290290
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
291291
GCC_WARN_UNUSED_FUNCTION = YES;
292292
GCC_WARN_UNUSED_VARIABLE = YES;
293-
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
293+
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
294294
MTL_ENABLE_DEBUG_INFO = YES;
295295
ONLY_ACTIVE_ARCH = YES;
296296
SDKROOT = iphoneos;
@@ -344,7 +344,7 @@
344344
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
345345
GCC_WARN_UNUSED_FUNCTION = YES;
346346
GCC_WARN_UNUSED_VARIABLE = YES;
347-
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
347+
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
348348
MTL_ENABLE_DEBUG_INFO = NO;
349349
SDKROOT = iphoneos;
350350
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
@@ -361,7 +361,7 @@
361361
CODE_SIGN_STYLE = Automatic;
362362
DEVELOPMENT_TEAM = 9YN2HU59K8;
363363
INFOPLIST_FILE = App/Info.plist;
364-
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
364+
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
365365
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
366366
OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
367367
PRODUCT_BUNDLE_IDENTIFIER = com.capacitorjs.app.testapp;
@@ -381,7 +381,7 @@
381381
CODE_SIGN_STYLE = Automatic;
382382
DEVELOPMENT_TEAM = 9YN2HU59K8;
383383
INFOPLIST_FILE = App/Info.plist;
384-
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
384+
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
385385
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
386386
PRODUCT_BUNDLE_IDENTIFIER = com.capacitorjs.app.testapp;
387387
PRODUCT_NAME = "$(TARGET_NAME)";

ios/App/Podfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
require_relative '../../node_modules/@capacitor/ios/scripts/pods_helpers'
22

3-
platform :ios, '13.0'
3+
platform :ios, '14.0'
44
use_frameworks!
55

66
# workaround to avoid Xcode caching of Pods that requires

0 commit comments

Comments
 (0)