Skip to content

Commit ccf478a

Browse files
committed
chore: migrate to Capacitor 8
1 parent 93624d0 commit ccf478a

File tree

13 files changed

+2057
-1293
lines changed

13 files changed

+2057
-1293
lines changed

android/app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
apply plugin: 'com.android.application'
22

33
android {
4-
namespace "com.capacitorjs.app.testapp"
5-
compileSdk rootProject.ext.compileSdkVersion
4+
namespace = "com.capacitorjs.app.testapp"
5+
compileSdk = rootProject.ext.compileSdkVersion
66
defaultConfig {
77
applicationId "com.capacitorjs.app.testapp"
88
minSdkVersion rootProject.ext.minSdkVersion

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|navigation"
14+
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|smallestScreenSize|screenLayout|uiMode|navigation|density"
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.7.2'
11-
classpath 'com.google.gms:google-services:4.4.2'
10+
classpath 'com.android.tools.build:gradle:8.13.0'
11+
classpath 'com.google.gms:google-services:4.4.4'
1212

1313
// NOTE: Do not place your application dependencies here; they belong
1414
// in the individual module build.gradle files
181 Bytes
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.11.1-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-all.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

android/gradlew

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,7 @@ done
8686
# shellcheck disable=SC2034
8787
APP_BASE_NAME=${0##*/}
8888
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
89-
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
90-
' "$PWD" ) || exit
89+
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
9190

9291
# Use the maximum available, or set MAX_FD != -1 to use that value.
9392
MAX_FD=maximum
@@ -115,7 +114,7 @@ case "$( uname )" in #(
115114
NONSTOP* ) nonstop=true ;;
116115
esac
117116

118-
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
117+
CLASSPATH="\\\"\\\""
119118

120119

121120
# Determine the Java command to use to start the JVM.
@@ -206,15 +205,15 @@ fi
206205
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
207206

208207
# Collect all arguments for the java command:
209-
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
208+
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
210209
# and any embedded shellness will be escaped.
211210
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
212211
# treated as '${Hostname}' itself on the command line.
213212

214213
set -- \
215214
"-Dorg.gradle.appname=$APP_BASE_NAME" \
216215
-classpath "$CLASSPATH" \
217-
org.gradle.wrapper.GradleWrapperMain \
216+
-jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
218217
"$@"
219218

220219
# Stop when "xargs" is not available.

android/gradlew.bat

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,11 @@ goto fail
7070
:execute
7171
@rem Setup the command line
7272

73-
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
73+
set CLASSPATH=
7474

7575

7676
@rem Execute Gradle
77-
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
77+
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
7878

7979
:end
8080
@rem End local scope for the variables with windows NT shell

android/variables.gradle

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
ext {
2-
minSdkVersion = 23
3-
compileSdkVersion = 35
4-
targetSdkVersion = 35
5-
androidxActivityVersion = '1.9.2'
6-
androidxAppCompatVersion = '1.7.0'
7-
androidxCoordinatorLayoutVersion = '1.2.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'
2+
minSdkVersion = 24
3+
compileSdkVersion = 36
4+
targetSdkVersion = 36
5+
androidxActivityVersion = '1.11.0'
6+
androidxAppCompatVersion = '1.7.1'
7+
androidxCoordinatorLayoutVersion = '1.3.0'
8+
androidxCoreVersion = '1.17.0'
9+
androidxBrowserVersion = '1.9.0'
10+
androidxFragmentVersion = '1.8.9'
11+
androidxMaterialVersion = '1.13.0'
12+
androidxExifInterfaceVersion = '1.4.1'
13+
firebaseMessagingVersion = '25.0.1'
1414
playServicesLocationVersion = '21.3.0'
1515
junitVersion = '4.13.2'
16-
androidxJunitVersion = '1.2.1'
17-
androidxEspressoCoreVersion = '3.6.1'
18-
cordovaAndroidVersion = '10.1.1'
19-
coreSplashScreenVersion = '1.0.1'
20-
androidxWebkitVersion = '1.12.1'
16+
androidxJunitVersion = '1.3.0'
17+
androidxEspressoCoreVersion = '3.7.0'
18+
cordovaAndroidVersion = '14.0.1'
19+
coreSplashScreenVersion = '1.2.0'
20+
androidxWebkitVersion = '1.14.0'
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 = 14.0;
293+
IPHONEOS_DEPLOYMENT_TARGET = 15.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 = 14.0;
347+
IPHONEOS_DEPLOYMENT_TARGET = 15.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 = 14.0;
364+
IPHONEOS_DEPLOYMENT_TARGET = 15.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 = 14.0;
384+
IPHONEOS_DEPLOYMENT_TARGET = 15.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, '14.0'
3+
platform :ios, '15.0'
44
use_frameworks!
55

66
# workaround to avoid Xcode caching of Pods that requires

0 commit comments

Comments
 (0)