Skip to content

Commit d777860

Browse files
authored
Merge pull request #25 from joinflux/capacitor-6
feat(capacitor): upgrade for Capacitor v6
2 parents 8028fc6 + 806a152 commit d777860

File tree

8 files changed

+2298
-2746
lines changed

8 files changed

+2298
-2746
lines changed

JoinfluxCapacitorSegment.podspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ Pod::Spec.new do |s|
1111
s.author = package['author']
1212
s.source = { :git => package['repository']['url'], :tag => s.version.to_s }
1313
s.source_files = 'ios/Plugin/**/*.{swift,h,m,c,cc,mm,cpp}'
14-
s.ios.deployment_target = '13.0'
15-
s.dependency 'Capacitor', '~> 5.0'
14+
s.ios.deployment_target = '15.0'
15+
s.dependency 'Capacitor', '~> 6.0'
1616
s.dependency 'Analytics', '~> 4.0'
1717
s.swift_version = '5.1'
1818
end

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ npx cap sync
2828
- Capacitor 3 is recommended for this version
2929
- Version 1.x.x will target Capacitor 4
3030
- Version 2.x.x will target Capacitor 5
31+
- Version 6.x.x will target Capacitor 6
3132

3233
## API
3334

android/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,18 @@ buildscript {
1111
mavenCentral()
1212
}
1313
dependencies {
14-
classpath 'com.android.tools.build:gradle:8.0.0'
14+
classpath 'com.android.tools.build:gradle:8.2.1'
1515
}
1616
}
1717

1818
apply plugin: 'com.android.library'
1919

2020
android {
2121
namespace "com.joinflux.flux.segment"
22-
compileSdkVersion project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 33
22+
compileSdk project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 34
2323
defaultConfig {
2424
minSdkVersion project.hasProperty('minSdkVersion') ? rootProject.ext.minSdkVersion : 22
25-
targetSdkVersion project.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion : 33
25+
targetSdkVersion project.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion : 34
2626
versionCode 1
2727
versionName "1.0"
2828
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1.73 KB
Binary file not shown.
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
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.1-all.zip
44
networkTimeout=10000
5+
validateDistributionUrl=true
56
zipStoreBase=GRADLE_USER_HOME
67
zipStorePath=wrapper/dists

android/gradlew

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

0 commit comments

Comments
 (0)