Skip to content

Commit 8443db4

Browse files
BREAKING CHANGE: Major version bump of plugin to support Capacitor 8
1 parent 253d2d5 commit 8443db4

File tree

11 files changed

+42
-41
lines changed

11 files changed

+42
-41
lines changed

.github/workflows/basic-tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020

2121
verify-plugin:
2222
needs: ['setup', 'lint-test', 'build-packages']
23-
runs-on: 'macos-14'
23+
runs-on: 'macos-latest'
2424
timeout-minutes: 30
2525
steps:
2626
- uses: actions/checkout@v5
@@ -32,7 +32,7 @@ jobs:
3232

3333
build-example-app:
3434
needs: ['verify-plugin']
35-
runs-on: 'macos-14'
35+
runs-on: 'macos-latest'
3636
timeout-minutes: 30
3737
steps:
3838
- uses: actions/checkout@v5

.github/workflows/reusable_lint-packages.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88

99
jobs:
1010
lint:
11-
runs-on: 'macos-14'
11+
runs-on: 'macos-latest'
1212
timeout-minutes: 30
1313
steps:
1414
- uses: actions/checkout@v5

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ let package = Package(
1111
targets: ["CapApp-SPM"])
1212
],
1313
dependencies: [
14-
.package(url: "https://github.com/ionic-team/capacitor-swift-pm.git", exact: "8.0.0-beta.0"),
14+
.package(url: "https://github.com/ionic-team/capacitor-swift-pm.git", exact: "8.0.0"),
1515
.package(name: "CapacitorBarcodeScanner", path: "../../../../plugin")
1616
],
1717
targets: [

example-app-spm/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
},
1414
"dependencies": {
1515
"@capacitor/barcode-scanner": "file:../plugin/",
16-
"@capacitor/core": "next",
17-
"@capacitor/ios": "next",
16+
"@capacitor/core": "^8.0.0",
17+
"@capacitor/ios": "^8.0.0",
1818
"@ionic/react": "^8.7.9",
1919
"@ionic/react-router": "^8.7.9",
2020
"ionicons": "^8.0.13",
@@ -24,7 +24,7 @@
2424
"react-router-dom": "^5.3.4"
2525
},
2626
"devDependencies": {
27-
"@capacitor/cli": "next",
27+
"@capacitor/cli": "^8.0.0",
2828
"@testing-library/dom": "^10.4.1",
2929
"@testing-library/jest-dom": "^6.9.1",
3030
"@testing-library/react": "^16.3.0",
Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
ext {
22
minSdkVersion = 26
3-
compileSdkVersion = 35
4-
targetSdkVersion = 35
3+
compileSdkVersion = 36
4+
targetSdkVersion = 36
55
androidxActivityVersion = '1.8.0'
6-
androidxAppCompatVersion = '1.7.0'
7-
androidxCoordinatorLayoutVersion = '1.2.0'
6+
androidxAppCompatVersion = '1.7.1'
7+
androidxCoordinatorLayoutVersion = '1.3.0'
88
androidxCoreVersion = '1.12.0'
99
androidxFragmentVersion = '1.6.2'
10-
coreSplashScreenVersion = '1.0.1'
10+
coreSplashScreenVersion = '1.2.0'
1111
androidxWebkitVersion = '1.9.0'
1212
junitVersion = '4.13.2'
13-
androidxJunitVersion = '1.1.5'
14-
androidxEspressoCoreVersion = '3.5.1'
13+
androidxJunitVersion = '1.3.0'
14+
androidxEspressoCoreVersion = '3.7.0'
1515
cordovaAndroidVersion = '10.1.1'
1616
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@
351351
CURRENT_PROJECT_VERSION = 1;
352352
DEVELOPMENT_TEAM = 9YN2HU59K8;
353353
INFOPLIST_FILE = App/Info.plist;
354-
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
354+
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
355355
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
356356
MARKETING_VERSION = 1.0;
357357
OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
@@ -372,7 +372,7 @@
372372
CURRENT_PROJECT_VERSION = 1;
373373
DEVELOPMENT_TEAM = 9YN2HU59K8;
374374
INFOPLIST_FILE = App/Info.plist;
375-
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
375+
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
376376
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
377377
MARKETING_VERSION = 1.0;
378378
PRODUCT_BUNDLE_IDENTIFIER = io.ionic.starter;

example-app/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
"lint": "eslint"
1313
},
1414
"dependencies": {
15-
"@capacitor/android": "next",
15+
"@capacitor/android": "^8.0.0",
1616
"@capacitor/barcode-scanner": "file:../plugin/",
17-
"@capacitor/core": "next",
18-
"@capacitor/ios": "next",
17+
"@capacitor/core": "^8.0.0",
18+
"@capacitor/ios": "^8.0.0",
1919
"@ionic/react": "^8.7.9",
2020
"@ionic/react-router": "^8.7.9",
2121
"ionicons": "^8.0.13",
@@ -25,7 +25,7 @@
2525
"react-router-dom": "^5.3.4"
2626
},
2727
"devDependencies": {
28-
"@capacitor/cli": "next",
28+
"@capacitor/cli": "^8.0.0",
2929
"@testing-library/dom": "^10.4.1",
3030
"@testing-library/jest-dom": "^6.9.1",
3131
"@testing-library/react": "^16.3.0",

plugin/CapacitorBarcodeScanner.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ 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/Sources/**/*.{swift,h,m,c,cc,mm,cpp}'
14-
s.ios.deployment_target = '14.0'
14+
s.ios.deployment_target = '15.0'
1515
s.dependency 'Capacitor'
1616
s.dependency 'OSBarcodeLib', '2.0.1'
1717
s.swift_version = '5.1'

plugin/Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import PackageDescription
33

44
let package = Package(
55
name: "CapacitorBarcodeScanner",
6-
platforms: [.iOS(.v14)],
6+
platforms: [.iOS(.v15)],
77
products: [
88
.library(
99
name: "CapacitorBarcodeScanner",

plugin/android/build.gradle

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
ext {
22
junitVersion = project.hasProperty('junitVersion') ? rootProject.ext.junitVersion : '4.13.2'
3-
androidxAppCompatVersion = project.hasProperty('androidxAppCompatVersion') ? rootProject.ext.androidxAppCompatVersion : '1.7.0'
4-
androidxJunitVersion = project.hasProperty('androidxJunitVersion') ? rootProject.ext.androidxJunitVersion : '1.2.1'
5-
androidxEspressoCoreVersion = project.hasProperty('androidxEspressoCoreVersion') ? rootProject.ext.androidxEspressoCoreVersion : '3.6.1'
3+
androidxAppCompatVersion = project.hasProperty('androidxAppCompatVersion') ? rootProject.ext.androidxAppCompatVersion : '1.7.1'
4+
androidxJunitVersion = project.hasProperty('androidxJunitVersion') ? rootProject.ext.androidxJunitVersion : '1.3.0'
5+
androidxEspressoCoreVersion = project.hasProperty('androidxEspressoCoreVersion') ? rootProject.ext.androidxEspressoCoreVersion : '3.7.0'
6+
kotlinxCoroutinesVersion = project.hasProperty('kotlinxCoroutinesVersion') ? rootProject.ext.kotlinxCoroutinesVersion : '1.10.2'
67
}
78

89
buildscript {
@@ -25,10 +26,10 @@ apply plugin: 'kotlin-android'
2526

2627
android {
2728
namespace = "com.capacitorjs.barcodescanner"
28-
compileSdk = project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 35
29+
compileSdk = project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 36
2930
defaultConfig {
3031
minSdkVersion project.hasProperty('minSdkVersion') ? rootProject.ext.minSdkVersion : 26
31-
targetSdkVersion project.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion : 35
32+
targetSdkVersion project.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion : 36
3233
versionCode 1
3334
versionName "1.0"
3435
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -61,17 +62,17 @@ dependencies {
6162
implementation "io.ionic.libs:ionbarcode-android:2.0.1@aar"
6263
implementation project(':capacitor-android')
6364
implementation "androidx.appcompat:appcompat:$androidxAppCompatVersion"
64-
implementation 'androidx.activity:activity-ktx:1.9.3'
65-
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.3'
66-
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3'
67-
implementation 'com.google.zxing:core:3.4.1'
65+
implementation 'androidx.activity:activity-ktx:1.11.0'
66+
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:$kotlinxCoroutinesVersion"
67+
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlinxCoroutinesVersion"
68+
implementation 'com.google.zxing:core:3.5.3'
6869
implementation 'com.google.mlkit:barcode-scanning:17.3.0'
69-
implementation 'androidx.camera:camera-camera2:1.4.0'
70-
implementation 'androidx.camera:camera-lifecycle:1.4.0'
71-
implementation 'androidx.camera:camera-view:1.4.0'
72-
implementation 'androidx.activity:activity-compose:1.9.3'
73-
implementation 'androidx.compose.material3:material3:1.3.1'
74-
implementation 'androidx.compose.material3:material3-window-size-class:1.3.1'
70+
implementation 'androidx.camera:camera-camera2:1.5.1'
71+
implementation 'androidx.camera:camera-lifecycle:1.5.1'
72+
implementation 'androidx.camera:camera-view:1.5.1'
73+
implementation 'androidx.activity:activity-compose:1.11.0'
74+
implementation 'androidx.compose.material3:material3:1.4.0'
75+
implementation 'androidx.compose.material3:material3-window-size-class:1.4.0'
7576
testImplementation "junit:junit:$junitVersion"
7677
androidTestImplementation "androidx.test.ext:junit:$androidxJunitVersion"
7778
androidTestImplementation "androidx.test.espresso:espresso-core:$androidxEspressoCoreVersion"

0 commit comments

Comments
 (0)