Skip to content

Commit 7fb262c

Browse files
authored
feat!: capacitor 6 support (#33)
* feat!: capacitor 6 support * chore: fix verify * chore: fix ci misspelling * chore: fix pr dev building * chore: no pr dev builds
1 parent 7f92c3d commit 7fb262c

File tree

15 files changed

+69
-63
lines changed

15 files changed

+69
-63
lines changed

.github/workflows/dev-releases-for-pr.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ permissions:
1212

1313
jobs:
1414
release-dev-of-plugins:
15+
if: false
1516
runs-on: ubuntu-latest
1617
timeout-minutes: 30
1718
permissions:
@@ -28,14 +29,14 @@ jobs:
2829

2930
- name: "NPM Identity"
3031
run: |
31-
echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" >> ~/.npmrc
32+
echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_AUTH_TOKEN }}" >> ~/.npmrc
3233
npm whoami
3334
3435
- name: Version & Publish
3536
env:
3637
PR_NUMBER: ${{ github.event.pull_request.number }}
3738
GH_TOKEN: ${{ secrets.CAP_GH_RELEASE_TOKEN }}
38-
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
39+
NODE_AUTH_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }}
3940
run: |
4041
npm whoami
4142
npm version prerelease --no-git-tag-version -f --preid dev-$PR_NUMBER-$(date +%Y%m%dT%H%M%S)

.github/workflows/reusable_verify-packages.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
working-directory: ./plugin
5252

5353
verify-web:
54-
runs-on: uubuntu-22.04
54+
runs-on: ubuntu-22.04
5555
timeout-minutes: 30
5656
steps:
5757
- uses: actions/checkout@v3

README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1169,4 +1169,3 @@ but the current specification only allows X, Y, and (optionally) Z to be defined
11691169
| **`None`** | <code>'None'</code> | No base map tiles. |
11701170

11711171
</docgen-api>
1172-

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
"ci:publish:dev": "lerna publish prerelease --conventional-commits --conventional-prerelease --preid dev-$(date +\"%Y%m%dT%H%M%S\") --force-publish --no-changelog --no-git-tag-version --dist-tag dev --no-push --yes"
1717
},
1818
"devDependencies": {
19+
"@capacitor/ios": "^6.1.0",
1920
"@types/node": "^20.11.25",
2021
"husky": "^9.0.1",
2122
"lerna": "^8.1.2",

plugin/CapacitorGoogleMaps.podspec

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ Pod::Spec.new do |s|
1111
s.author = package['author']
1212
s.source = { :git => 'https://github.com/ionic-team/capacitor-plugins.git', :tag => package['name'] + '@' + package['version'] }
1313
s.source_files = 'ios/Plugin/**/*.{swift,h,m,c,cc,mm,cpp}', 'google-maps/ios/Plugin/**/*.{swift,h,m,c,cc,mm,cpp}'
14-
s.ios.deployment_target = '13.0'
14+
s.ios.deployment_target = '14.0'
1515
s.dependency 'Capacitor'
16-
s.dependency 'GoogleMaps', '~> 7.4'
17-
s.dependency 'Google-Maps-iOS-Utils', '~> 4.2'
16+
s.dependency 'GoogleMaps', '~> 8.4'
17+
s.dependency 'Google-Maps-iOS-Utils', '~> 5.0'
1818
s.swift_version = '5.1'
1919
s.static_framework = true
2020
end

plugin/android/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ ext {
55
androidxJunitVersion = project.hasProperty('androidxJunitVersion') ? rootProject.ext.androidxJunitVersion : '1.1.5'
66
androidxEspressoCoreVersion = project.hasProperty('androidxEspressoCoreVersion') ? rootProject.ext.androidxEspressoCoreVersion : '3.5.1'
77
androidxCoreKTXVersion = project.hasProperty('androidxCoreKTXVersion') ? rootProject.ext.androidxCoreKTXVersion : '1.12.0'
8-
googleMapsPlayServicesVersion = project.hasProperty('googleMapsPlayServicesVersion') ? rootProject.ext.googleMapsPlayServicesVersion : '18.2.0'
8+
googleMapsPlayServicesVersion = project.hasProperty('googleMapsPlayServicesVersion') ? rootProject.ext.googleMapsPlayServicesVersion : '19.0.0'
99
googleMapsUtilsVersion = project.hasProperty('googleMapsUtilsVersion') ? rootProject.ext.googleMapsUtilsVersion : '3.8.2'
10-
googleMapsKtxVersion = project.hasProperty('googleMapsKtxVersion') ? rootProject.ext.googleMapsKtxVersion : '5.0.0'
11-
googleMapsUtilsKtxVersion = project.hasProperty('googleMapsUtilsKtxVersion') ? rootProject.ext.googleMapsUtilsKtxVersion : '5.0.0'
10+
googleMapsKtxVersion = project.hasProperty('googleMapsKtxVersion') ? rootProject.ext.googleMapsKtxVersion : '5.1.1'
11+
googleMapsUtilsKtxVersion = project.hasProperty('googleMapsUtilsKtxVersion') ? rootProject.ext.googleMapsUtilsKtxVersion : '5.1.1'
1212
kotlinxCoroutinesVersion = project.hasProperty('kotlinxCoroutinesVersion') ? rootProject.ext.kotlinxCoroutinesVersion : '1.7.3'
1313
}
1414

plugin/e2e-tests/android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ buildscript {
77
mavenCentral()
88
}
99
dependencies {
10-
classpath 'com.android.tools.build:gradle:8.0.0'
10+
classpath 'com.android.tools.build:gradle:8.2.2'
1111
classpath 'com.google.gms:google-services:4.3.15'
1212
classpath 'com.google.android.libraries.mapsplatform.secrets-gradle-plugin:secrets-gradle-plugin:2.0.1'
1313

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.0.2-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip
44
networkTimeout=10000
55
zipStoreBase=GRADLE_USER_HOME
66
zipStorePath=wrapper/dists
Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
ext {
22
minSdkVersion = 22
3-
compileSdkVersion = 33
4-
targetSdkVersion = 33
5-
androidxActivityVersion = '1.7.0'
3+
compileSdkVersion = 34
4+
targetSdkVersion = 34
5+
androidxActivityVersion = '1.8.0'
66
androidxAppCompatVersion = '1.6.1'
77
androidxCoordinatorLayoutVersion = '1.2.0'
8-
androidxCoreVersion = '1.10.0'
9-
androidxFragmentVersion = '1.5.6'
10-
androidxWebkitVersion = '1.6.1'
8+
androidxCoreVersion = '1.12.0'
9+
androidxFragmentVersion = '1.6.2'
10+
androidxWebkitVersion = '1.9.0'
1111
androidxJunitVersion = '1.1.5'
1212
androidxEspressoCoreVersion = '3.5.1'
1313
cordovaAndroidVersion = '10.1.1'
14-
coreSplashScreenVersion = '1.0.0'
14+
coreSplashScreenVersion = '1.0.1'
1515
junitVersion = '4.13.2'
1616
}

plugin/e2e-tests/ios/App/App/capacitor.config.json

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,12 @@
22
"appId": "io.ionic.starter",
33
"appName": "e2e-tests",
44
"webDir": "build",
5-
"bundledWebRuntime": false
5+
"bundledWebRuntime": false,
6+
"packageClassList": [
7+
"AppPlugin",
8+
"CapacitorGoogleMapsPlugin",
9+
"HapticsPlugin",
10+
"KeyboardPlugin",
11+
"StatusBarPlugin"
12+
]
613
}

0 commit comments

Comments
 (0)