Skip to content

Commit f7f0c0d

Browse files
authored
Capacitor 7 (#97)
* #96 use capacitor 7 * #96 upgrade deps * #96 upgrade deps * #96 upgrade deps * version 10 * #96 mock scrollIntoView
1 parent 2c27b47 commit f7f0c0d

11 files changed

Lines changed: 3318 additions & 3148 deletions

File tree

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v20.18.0
1+
v20.18.2

android/app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ android {
77
applicationId "net.leanstacks.ionic8"
88
minSdkVersion rootProject.ext.minSdkVersion
99
targetSdkVersion rootProject.ext.targetSdkVersion
10-
versionCode 6
11-
versionName "1.0.5"
10+
versionCode 10
11+
versionName "1.1.0.10"
1212
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1313
aaptOptions {
1414
// Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.

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
@@ -8,7 +8,7 @@
88
android:supportsRtl="true"
99
android:theme="@style/AppTheme">
1010
<activity
11-
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|smallestScreenSize|screenLayout|uiMode"
11+
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|smallestScreenSize|screenLayout|uiMode|navigation"
1212
android:name=".MainActivity"
1313
android:label="@string/title_activity_main"
1414
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.9.1'
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/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/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
coreSplashScreenVersion = '1.0.1'
11-
androidxWebkitVersion = '1.9.0'
11+
androidxWebkitVersion = '1.12.1'
1212
junitVersion = '4.13.2'
13-
androidxJunitVersion = '1.1.5'
14-
androidxEspressoCoreVersion = '3.5.1'
13+
androidxJunitVersion = '1.2.1'
14+
androidxEspressoCoreVersion = '3.6.1'
1515
cordovaAndroidVersion = '10.1.1'
1616
}

eslint.config.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,6 @@ export default tseslint.config(
4444
{
4545
// global ignores
4646
// do not add any other keys to this object
47-
ignores: ['coverage/', 'dist/'],
47+
ignores: ['android/', 'coverage/', 'dist/'],
4848
},
4949
);

0 commit comments

Comments
 (0)