diff --git a/example-app-spm/package.json b/example-app-spm/package.json index 349e666..4a644d3 100644 --- a/example-app-spm/package.json +++ b/example-app-spm/package.json @@ -13,8 +13,8 @@ }, "dependencies": { "@capacitor/barcode-scanner": "file:../plugin/", - "@capacitor/core": "next", - "@capacitor/ios": "next", + "@capacitor/core": "8.0.0-beta.0", + "@capacitor/ios": "8.0.0-beta.0", "@ionic/react": "^8.7.9", "@ionic/react-router": "^8.7.9", "ionicons": "^8.0.13", @@ -24,7 +24,7 @@ "react-router-dom": "^5.3.4" }, "devDependencies": { - "@capacitor/cli": "next", + "@capacitor/cli": "8.0.0-beta.0", "@testing-library/dom": "^10.4.1", "@testing-library/jest-dom": "^6.9.1", "@testing-library/react": "^16.3.0", diff --git a/example-app/android/variables.gradle b/example-app/android/variables.gradle index aaa91dd..7860fe0 100644 --- a/example-app/android/variables.gradle +++ b/example-app/android/variables.gradle @@ -1,16 +1,16 @@ ext { minSdkVersion = 26 - compileSdkVersion = 35 - targetSdkVersion = 35 + compileSdkVersion = 36 + targetSdkVersion = 36 androidxActivityVersion = '1.8.0' - androidxAppCompatVersion = '1.7.0' - androidxCoordinatorLayoutVersion = '1.2.0' + androidxAppCompatVersion = '1.7.1' + androidxCoordinatorLayoutVersion = '1.3.0' androidxCoreVersion = '1.12.0' androidxFragmentVersion = '1.6.2' - coreSplashScreenVersion = '1.0.1' + coreSplashScreenVersion = '1.2.0' androidxWebkitVersion = '1.9.0' junitVersion = '4.13.2' - androidxJunitVersion = '1.1.5' - androidxEspressoCoreVersion = '3.5.1' + androidxJunitVersion = '1.3.0' + androidxEspressoCoreVersion = '3.7.0' cordovaAndroidVersion = '10.1.1' } \ No newline at end of file diff --git a/example-app/ios/App/App.xcodeproj/project.pbxproj b/example-app/ios/App/App.xcodeproj/project.pbxproj index b47e188..15e9aea 100644 --- a/example-app/ios/App/App.xcodeproj/project.pbxproj +++ b/example-app/ios/App/App.xcodeproj/project.pbxproj @@ -351,7 +351,7 @@ CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = 9YN2HU59K8; INFOPLIST_FILE = App/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 14.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MARKETING_VERSION = 1.0; OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\""; @@ -372,7 +372,7 @@ CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = 9YN2HU59K8; INFOPLIST_FILE = App/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 14.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MARKETING_VERSION = 1.0; PRODUCT_BUNDLE_IDENTIFIER = io.ionic.starter; diff --git a/example-app/package.json b/example-app/package.json index 8025962..c9ae88c 100644 --- a/example-app/package.json +++ b/example-app/package.json @@ -12,10 +12,10 @@ "lint": "eslint" }, "dependencies": { - "@capacitor/android": "next", + "@capacitor/android": "8.0.0-beta.0", "@capacitor/barcode-scanner": "file:../plugin/", - "@capacitor/core": "next", - "@capacitor/ios": "next", + "@capacitor/core": "8.0.0-beta.0", + "@capacitor/ios": "8.0.0-beta.0", "@ionic/react": "^8.7.9", "@ionic/react-router": "^8.7.9", "ionicons": "^8.0.13", @@ -25,7 +25,7 @@ "react-router-dom": "^5.3.4" }, "devDependencies": { - "@capacitor/cli": "next", + "@capacitor/cli": "8.0.0-beta.0", "@testing-library/dom": "^10.4.1", "@testing-library/jest-dom": "^6.9.1", "@testing-library/react": "^16.3.0", diff --git a/plugin/CapacitorBarcodeScanner.podspec b/plugin/CapacitorBarcodeScanner.podspec index 8260a11..9a43812 100644 --- a/plugin/CapacitorBarcodeScanner.podspec +++ b/plugin/CapacitorBarcodeScanner.podspec @@ -11,7 +11,7 @@ Pod::Spec.new do |s| s.author = package['author'] s.source = { :git => package['repository']['url'], :tag => s.version.to_s } s.source_files = 'ios/Sources/**/*.{swift,h,m,c,cc,mm,cpp}' - s.ios.deployment_target = '14.0' + s.ios.deployment_target = '15.0' s.dependency 'Capacitor' s.dependency 'OSBarcodeLib', '2.0.1' s.swift_version = '5.1' diff --git a/plugin/Package.swift b/plugin/Package.swift index d088cb3..034d7aa 100644 --- a/plugin/Package.swift +++ b/plugin/Package.swift @@ -3,7 +3,7 @@ import PackageDescription let package = Package( name: "CapacitorBarcodeScanner", - platforms: [.iOS(.v14)], + platforms: [.iOS(.v15)], products: [ .library( name: "CapacitorBarcodeScanner", diff --git a/plugin/android/build.gradle b/plugin/android/build.gradle index 2cab252..adb2b9e 100644 --- a/plugin/android/build.gradle +++ b/plugin/android/build.gradle @@ -1,8 +1,9 @@ ext { junitVersion = project.hasProperty('junitVersion') ? rootProject.ext.junitVersion : '4.13.2' - androidxAppCompatVersion = project.hasProperty('androidxAppCompatVersion') ? rootProject.ext.androidxAppCompatVersion : '1.7.0' - androidxJunitVersion = project.hasProperty('androidxJunitVersion') ? rootProject.ext.androidxJunitVersion : '1.2.1' - androidxEspressoCoreVersion = project.hasProperty('androidxEspressoCoreVersion') ? rootProject.ext.androidxEspressoCoreVersion : '3.6.1' + androidxAppCompatVersion = project.hasProperty('androidxAppCompatVersion') ? rootProject.ext.androidxAppCompatVersion : '1.7.1' + androidxJunitVersion = project.hasProperty('androidxJunitVersion') ? rootProject.ext.androidxJunitVersion : '1.3.0' + androidxEspressoCoreVersion = project.hasProperty('androidxEspressoCoreVersion') ? rootProject.ext.androidxEspressoCoreVersion : '3.7.0' + kotlinxCoroutinesVersion = project.hasProperty('kotlinxCoroutinesVersion') ? rootProject.ext.kotlinxCoroutinesVersion : '1.10.2' } buildscript { @@ -25,10 +26,10 @@ apply plugin: 'kotlin-android' android { namespace = "com.capacitorjs.barcodescanner" - compileSdk = project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 35 + compileSdk = project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 36 defaultConfig { minSdkVersion project.hasProperty('minSdkVersion') ? rootProject.ext.minSdkVersion : 26 - targetSdkVersion project.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion : 35 + targetSdkVersion project.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion : 36 versionCode 1 versionName "1.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" @@ -61,17 +62,17 @@ dependencies { implementation "io.ionic.libs:ionbarcode-android:2.0.1@aar" implementation project(':capacitor-android') implementation "androidx.appcompat:appcompat:$androidxAppCompatVersion" - implementation 'androidx.activity:activity-ktx:1.9.3' - implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.3' - implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3' - implementation 'com.google.zxing:core:3.4.1' + implementation 'androidx.activity:activity-ktx:1.11.0' + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:$kotlinxCoroutinesVersion" + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlinxCoroutinesVersion" + implementation 'com.google.zxing:core:3.5.3' implementation 'com.google.mlkit:barcode-scanning:17.3.0' - implementation 'androidx.camera:camera-camera2:1.4.0' - implementation 'androidx.camera:camera-lifecycle:1.4.0' - implementation 'androidx.camera:camera-view:1.4.0' - implementation 'androidx.activity:activity-compose:1.9.3' - implementation 'androidx.compose.material3:material3:1.3.1' - implementation 'androidx.compose.material3:material3-window-size-class:1.3.1' + implementation 'androidx.camera:camera-camera2:1.5.1' + implementation 'androidx.camera:camera-lifecycle:1.5.1' + implementation 'androidx.camera:camera-view:1.5.1' + implementation 'androidx.activity:activity-compose:1.11.0' + implementation 'androidx.compose.material3:material3:1.4.0' + implementation 'androidx.compose.material3:material3-window-size-class:1.4.0' testImplementation "junit:junit:$junitVersion" androidTestImplementation "androidx.test.ext:junit:$androidxJunitVersion" androidTestImplementation "androidx.test.espresso:espresso-core:$androidxEspressoCoreVersion" diff --git a/plugin/package.json b/plugin/package.json index fe8eb03..001f354 100644 --- a/plugin/package.json +++ b/plugin/package.json @@ -53,10 +53,10 @@ "html5-qrcode": "2.3.8" }, "devDependencies": { - "@capacitor/android": "next", - "@capacitor/core": "next", + "@capacitor/android": "8.0.0-beta.0", + "@capacitor/core": "8.0.0-beta.0", "@capacitor/docgen": "0.3.0", - "@capacitor/ios": "next", + "@capacitor/ios": "8.0.0-beta.0", "@ionic/swiftlint-config": "^2.0.0", "@types/node": "^24.10.1", "@typescript-eslint/eslint-plugin": "^8.47.0",