Skip to content

Commit 19868e4

Browse files
jcesarmobilejcesarmobile
authored
chore!: Align plugin baselines with core (#171)
1 parent 07b2aec commit 19868e4

30 files changed

Lines changed: 579 additions & 524 deletions

‎README.md‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,7 @@ This plugin will use the following project variables (defined in your app's `var
6565
- `googleMapsKtxVersion`: version of `com.google.maps.android:maps-ktx` (default: `5.2.1`)
6666
- `googleMapsUtilsKtxVersion`: version of `com.google.maps.android:maps-utils-ktx` (default: `5.2.1`)
6767
- `kotlinxCoroutinesVersion`: version of `org.jetbrains.kotlinx:kotlinx-coroutines-android` and `org.jetbrains.kotlinx:kotlinx-coroutines-core` (default: `1.10.2`)
68-
- `androidxCoreKTXVersion`: version of `androidx.core:core-ktx` (default: `1.17.0`)
69-
- `kotlin_version`: version of `org.jetbrains.kotlin:kotlin-stdlib` (default: `2.2.20`)
68+
- `androidxCoreVersion`: version of `androidx.core:core` (default: `1.19.0`)
7069

7170

7271
## Usage

‎example-app-spm/ios/App/App.xcodeproj/project.pbxproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@
230230
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
231231
GCC_WARN_UNUSED_FUNCTION = YES;
232232
GCC_WARN_UNUSED_VARIABLE = YES;
233-
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
233+
IPHONEOS_DEPLOYMENT_TARGET = 16.0;
234234
MTL_ENABLE_DEBUG_INFO = YES;
235235
ONLY_ACTIVE_ARCH = YES;
236236
SDKROOT = iphoneos;
@@ -281,7 +281,7 @@
281281
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
282282
GCC_WARN_UNUSED_FUNCTION = YES;
283283
GCC_WARN_UNUSED_VARIABLE = YES;
284-
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
284+
IPHONEOS_DEPLOYMENT_TARGET = 16.0;
285285
MTL_ENABLE_DEBUG_INFO = NO;
286286
SDKROOT = iphoneos;
287287
SWIFT_COMPILATION_MODE = wholemodule;
@@ -298,7 +298,7 @@
298298
CODE_SIGN_STYLE = Automatic;
299299
CURRENT_PROJECT_VERSION = 1;
300300
INFOPLIST_FILE = App/Info.plist;
301-
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
301+
IPHONEOS_DEPLOYMENT_TARGET = 16.0;
302302
LD_RUNPATH_SEARCH_PATHS = (
303303
"$(inherited)",
304304
"@executable_path/Frameworks",
@@ -320,7 +320,7 @@
320320
CODE_SIGN_STYLE = Automatic;
321321
CURRENT_PROJECT_VERSION = 1;
322322
INFOPLIST_FILE = App/Info.plist;
323-
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
323+
IPHONEOS_DEPLOYMENT_TARGET = 16.0;
324324
LD_RUNPATH_SEARCH_PATHS = (
325325
"$(inherited)",
326326
"@executable_path/Frameworks",

‎example-app-spm/ios/App/App/AppDelegate.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import UIKit
22
import Capacitor
33

4-
@UIApplicationMain
4+
@main
55
class AppDelegate: UIResponder, UIApplicationDelegate {
66

77
var window: UIWindow?

‎example-app-spm/ios/App/CapApp-SPM/Package.swift‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,26 +4,25 @@ import PackageDescription
44
// DO NOT MODIFY THIS FILE - managed by Capacitor CLI commands
55
let package = Package(
66
name: "CapApp-SPM",
7-
platforms: [.iOS(.v15)],
7+
platforms: [.iOS(.v16)],
88
products: [
99
.library(
1010
name: "CapApp-SPM",
1111
targets: ["CapApp-SPM"])
1212
],
1313
dependencies: [
14-
.package(url: "https://github.com/ionic-team/capacitor-swift-pm.git", exact: "8.0.0"),
15-
.package(name: "CapacitorApp", path: "../../../../node_modules/.pnpm/@capacitor+app@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/app"),
14+
.package(url: "https://github.com/ionic-team/capacitor-swift-pm.git", exact: "9.0.0-alpha.5"),
15+
.package(name: "CapacitorApp", path: "../../../../node_modules/.pnpm/@capacitor+app@9.0.0-alpha.1_@capacitor+core@9.0.0-alpha.5/node_modules/@capacitor/app"),
1616
.package(name: "CapacitorGoogleMaps", path: "../../../../plugin"),
17-
.package(name: "CapacitorHaptics", path: "../../../../node_modules/.pnpm/@capacitor+haptics@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/haptics"),
18-
.package(name: "CapacitorKeyboard", path: "../../../../node_modules/.pnpm/@capacitor+keyboard@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/keyboard"),
19-
.package(name: "CapacitorStatusBar", path: "../../../../node_modules/.pnpm/@capacitor+status-bar@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/status-bar")
17+
.package(name: "CapacitorHaptics", path: "../../../../node_modules/.pnpm/@capacitor+haptics@8.0.0-next.3_@capacitor+core@9.0.0-alpha.5/node_modules/@capacitor/haptics"),
18+
.package(name: "CapacitorKeyboard", path: "../../../../node_modules/.pnpm/@capacitor+keyboard@8.0.0-next.4_@capacitor+core@9.0.0-alpha.5/node_modules/@capacitor/keyboard"),
19+
.package(name: "CapacitorStatusBar", path: "../../../../node_modules/.pnpm/@capacitor+status-bar@9.0.0-alpha.1_@capacitor+core@9.0.0-alpha.5/node_modules/@capacitor/status-bar")
2020
],
2121
targets: [
2222
.target(
2323
name: "CapApp-SPM",
2424
dependencies: [
2525
.product(name: "Capacitor", package: "capacitor-swift-pm"),
26-
.product(name: "Cordova", package: "capacitor-swift-pm"),
2726
.product(name: "CapacitorApp", package: "CapacitorApp"),
2827
.product(name: "CapacitorGoogleMaps", package: "CapacitorGoogleMaps"),
2928
.product(name: "CapacitorHaptics", package: "CapacitorHaptics"),

‎example-app-spm/package.json‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -3,46 +3,46 @@
33
"version": "0.1.1",
44
"private": true,
55
"dependencies": {
6-
"@capacitor/android": "^8.0.0",
7-
"@capacitor/app": "^8.0.0",
8-
"@capacitor/core": "^8.0.0",
6+
"@capacitor/android": "next",
7+
"@capacitor/app": "next",
8+
"@capacitor/core": "next",
99
"@capacitor/google-maps": "workspace:*",
10-
"@capacitor/haptics": "^8.0.0",
11-
"@capacitor/ios": "^8.0.0",
12-
"@capacitor/keyboard": "^8.0.0",
13-
"@capacitor/status-bar": "^8.0.0",
14-
"@ionic/react": "^8.7.11",
15-
"@ionic/react-router": "^8.7.11",
10+
"@capacitor/haptics": "next",
11+
"@capacitor/ios": "next",
12+
"@capacitor/keyboard": "next",
13+
"@capacitor/status-bar": "next",
14+
"@ionic/react": "^8.8.13",
15+
"@ionic/react-router": "^8.8.13",
1616
"@testing-library/jest-dom": "^6.9.1",
17-
"@testing-library/react": "^16.3.0",
17+
"@testing-library/react": "^16.3.2",
1818
"@testing-library/user-event": "^14.6.1",
1919
"@types/google.maps": "~3.58.1",
2020
"@types/jest": "^30.0.0",
21-
"@types/node": "^24.10.2",
22-
"@types/react": "^19.2.7",
21+
"@types/node": "^24.13.3",
22+
"@types/react": "^19.2.17",
2323
"@types/react-dom": "^19.2.3",
2424
"@types/react-router": "^5.1.20",
2525
"@types/react-router-dom": "^5.3.3",
2626
"ionicons": "^8.0.13",
27-
"react": "^19.2.1",
28-
"react-dom": "^19.2.1",
27+
"react": "^19.2.7",
28+
"react-dom": "^19.2.7",
2929
"react-router": "^5.3.4",
3030
"react-router-dom": "^5.3.4",
3131
"react-scripts": "^5.0.1",
3232
"typescript": "^5.9.3",
33-
"web-vitals": "^5.1.0",
34-
"workbox-background-sync": "^7.4.0",
35-
"workbox-broadcast-update": "^7.4.0",
36-
"workbox-cacheable-response": "^7.4.0",
37-
"workbox-core": "^7.4.0",
38-
"workbox-expiration": "^7.4.0",
39-
"workbox-google-analytics": "^7.4.0",
40-
"workbox-navigation-preload": "^7.4.0",
41-
"workbox-precaching": "^7.4.0",
42-
"workbox-range-requests": "^7.4.0",
43-
"workbox-routing": "^7.4.0",
44-
"workbox-strategies": "^7.4.0",
45-
"workbox-streams": "^7.4.0"
33+
"web-vitals": "^5.3.0",
34+
"workbox-background-sync": "^7.4.1",
35+
"workbox-broadcast-update": "^7.4.1",
36+
"workbox-cacheable-response": "^7.4.1",
37+
"workbox-core": "^7.4.1",
38+
"workbox-expiration": "^7.4.1",
39+
"workbox-google-analytics": "^7.4.1",
40+
"workbox-navigation-preload": "^7.4.1",
41+
"workbox-precaching": "^7.4.1",
42+
"workbox-range-requests": "^7.4.1",
43+
"workbox-routing": "^7.4.1",
44+
"workbox-strategies": "^7.4.1",
45+
"workbox-streams": "^7.4.1"
4646
},
4747
"scripts": {
4848
"start": "react-scripts start",
@@ -69,7 +69,7 @@
6969
]
7070
},
7171
"devDependencies": {
72-
"@capacitor/cli": "^8.0.0"
72+
"@capacitor/cli": "next"
7373
},
7474
"description": "An Ionic project"
75-
}
75+
}

‎example-app/android/app/build.gradle‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ android {
2121
defaultConfig {
2222
applicationId "com.capacitorjs.maps"
2323
minSdkVersion rootProject.ext.minSdkVersion
24-
targetSdkVersion rootProject.ext.targetSdkVersion
2524
versionCode 1
2625
versionName "1.0"
2726
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -35,17 +34,11 @@ android {
3534
buildTypes {
3635
release {
3736
minifyEnabled false
38-
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
37+
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
3938
}
4039
}
4140
}
4241

43-
repositories {
44-
flatDir{
45-
dirs '../capacitor-cordova-android-plugins/src/main/libs', 'libs'
46-
}
47-
}
48-
4942
dependencies {
5043
implementation fileTree(include: ['*.jar'], dir: 'libs')
5144
implementation "androidx.appcompat:appcompat:$androidxAppCompatVersion"
@@ -55,7 +48,6 @@ dependencies {
5548
testImplementation "junit:junit:$junitVersion"
5649
androidTestImplementation "androidx.test.ext:junit:$androidxJunitVersion"
5750
androidTestImplementation "androidx.test.espresso:espresso-core:$androidxEspressoCoreVersion"
58-
implementation project(':capacitor-cordova-android-plugins')
5951
}
6052

6153
apply from: 'capacitor.build.gradle'

‎example-app/android/app/capacitor.build.gradle‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ android {
77
}
88
}
99

10-
apply from: "../capacitor-cordova-android-plugins/cordova.variables.gradle"
1110
dependencies {
1211
implementation project(':capacitor-app')
1312
implementation project(':capacitor-google-maps')

‎example-app/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.13.0'
11-
classpath 'com.google.gms:google-services:4.4.4'
10+
classpath 'com.android.tools.build:gradle:9.2.1'
11+
classpath 'com.google.gms:google-services:4.5.0'
1212
classpath 'com.google.android.libraries.mapsplatform.secrets-gradle-plugin:secrets-gradle-plugin:2.0.1'
1313
// NOTE: Do not place your application dependencies here; they belong
1414
// in the individual module build.gradle files

‎example-app/android/capacitor.settings.gradle‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
11
// DO NOT EDIT THIS FILE! IT IS GENERATED EACH TIME "capacitor update" IS RUN
22
include ':capacitor-android'
3-
project(':capacitor-android').projectDir = new File('../../node_modules/.pnpm/@capacitor+android@8.0.1_@capacitor+core@8.0.1/node_modules/@capacitor/android/capacitor')
3+
project(':capacitor-android').projectDir = new File('../../node_modules/.pnpm/@capacitor+android@9.0.0-alpha.5_@capacitor+core@9.0.0-alpha.5/node_modules/@capacitor/android/capacitor')
4+
45

56
include ':capacitor-app'
6-
project(':capacitor-app').projectDir = new File('../../node_modules/.pnpm/@capacitor+app@8.0.0_@capacitor+core@8.0.1/node_modules/@capacitor/app/android')
7+
project(':capacitor-app').projectDir = new File('../../node_modules/.pnpm/@capacitor+app@9.0.0-alpha.1_@capacitor+core@9.0.0-alpha.5/node_modules/@capacitor/app/android')
78

89
include ':capacitor-google-maps'
910
project(':capacitor-google-maps').projectDir = new File('../../plugin/android')
1011

1112
include ':capacitor-haptics'
12-
project(':capacitor-haptics').projectDir = new File('../../node_modules/.pnpm/@capacitor+haptics@8.0.0_@capacitor+core@8.0.1/node_modules/@capacitor/haptics/android')
13+
project(':capacitor-haptics').projectDir = new File('../../node_modules/.pnpm/@capacitor+haptics@8.0.0-next.3_@capacitor+core@9.0.0-alpha.5/node_modules/@capacitor/haptics/android')
1314

1415
include ':capacitor-keyboard'
15-
project(':capacitor-keyboard').projectDir = new File('../../node_modules/.pnpm/@capacitor+keyboard@8.0.0_@capacitor+core@8.0.1/node_modules/@capacitor/keyboard/android')
16+
project(':capacitor-keyboard').projectDir = new File('../../node_modules/.pnpm/@capacitor+keyboard@8.0.0-next.4_@capacitor+core@9.0.0-alpha.5/node_modules/@capacitor/keyboard/android')
1617

1718
include ':capacitor-status-bar'
18-
project(':capacitor-status-bar').projectDir = new File('../../node_modules/.pnpm/@capacitor+status-bar@8.0.0_@capacitor+core@8.0.1/node_modules/@capacitor/status-bar/android')
19+
project(':capacitor-status-bar').projectDir = new File('../../node_modules/.pnpm/@capacitor+status-bar@9.0.0-alpha.1_@capacitor+core@9.0.0-alpha.5/node_modules/@capacitor/status-bar/android')

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

4.59 KB
Binary file not shown.

0 commit comments

Comments
 (0)