diff --git a/example-app-spm/ios/App/App.xcodeproj/project.pbxproj b/example-app-spm/ios/App/App.xcodeproj/project.pbxproj index d520421..c9bfaee 100644 --- a/example-app-spm/ios/App/App.xcodeproj/project.pbxproj +++ b/example-app-spm/ios/App/App.xcodeproj/project.pbxproj @@ -227,7 +227,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 14.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -278,7 +278,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 14.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SWIFT_COMPILATION_MODE = wholemodule; diff --git a/example-app-spm/ios/App/App.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/example-app-spm/ios/App/App.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index a44e890..264e02e 100644 --- a/example-app-spm/ios/App/App.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/example-app-spm/ios/App/App.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -1,13 +1,13 @@ { - "originHash" : "69cd23605682c9d21ff0074d7c261fdb3d24ca635fa81c1010b8a8f39682d8e9", + "originHash" : "a7d68a4c36dc33e074bb4082fe90b1c8df33b9dfd986066a70517a5f74458e2e", "pins" : [ { "identity" : "capacitor-swift-pm", "kind" : "remoteSourceControl", "location" : "https://github.com/ionic-team/capacitor-swift-pm.git", "state" : { - "branch" : "main", - "revision" : "eb9a900023fe46671fc3d6f6761cbecc910345f7" + "revision" : "3e7ccfb8ab4d321ffcbd4e490234758e139f8a09", + "version" : "8.0.1" } }, { @@ -15,8 +15,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/OutSystems/OSBarcodeLib-iOS.git", "state" : { - "revision" : "fa51b49cf43ee227b02b371db83c8cb2e2cf8b55", - "version" : "2.1.0" + "revision" : "1ae7a716331be720f9f1075ef033276014c341ec", + "version" : "2.1.1" } } ], diff --git a/example-app-spm/ios/App/App/Info.plist b/example-app-spm/ios/App/App/Info.plist index 859b3cd..1c56275 100644 --- a/example-app-spm/ios/App/App/Info.plist +++ b/example-app-spm/ios/App/App/Info.plist @@ -1,53 +1,53 @@ - - CFBundleDevelopmentRegion - en - CFBundleDisplayName - example-app - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - $(PRODUCT_NAME) - CFBundlePackageType - APPL - CFBundleShortVersionString - $(MARKETING_VERSION) - CFBundleVersion - $(CURRENT_PROJECT_VERSION) - LSRequiresIPhoneOS - - UILaunchStoryboardName - LaunchScreen - UIMainStoryboardFile - Main - UIRequiredDeviceCapabilities - - armv7 - - UISupportedInterfaceOrientations - - UIInterfaceOrientationPortrait - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - - UISupportedInterfaceOrientations~ipad - - UIInterfaceOrientationPortrait - UIInterfaceOrientationPortraitUpsideDown - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - - UIViewControllerBasedStatusBarAppearance - - NSCameraUsageDescription - Uses the camera to scan barcodes. - CAPACITOR_DEBUG - $(CAPACITOR_DEBUG) - - \ No newline at end of file + + CAPACITOR_DEBUG + $(CAPACITOR_DEBUG) + CFBundleDevelopmentRegion + en + CFBundleDisplayName + example-app + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + APPL + CFBundleShortVersionString + $(MARKETING_VERSION) + CFBundleVersion + $(CURRENT_PROJECT_VERSION) + LSRequiresIPhoneOS + + NSCameraUsageDescription + Uses the camera to scan barcodes. + UILaunchStoryboardName + LaunchScreen + UIMainStoryboardFile + Main + UIRequiredDeviceCapabilities + + armv7 + + UISupportedInterfaceOrientations + + UIInterfaceOrientationPortrait + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + UISupportedInterfaceOrientations~ipad + + UIInterfaceOrientationPortrait + UIInterfaceOrientationPortraitUpsideDown + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + UIViewControllerBasedStatusBarAppearance + + + diff --git a/example-app-spm/ios/App/CapApp-SPM/Package.swift b/example-app-spm/ios/App/CapApp-SPM/Package.swift index 0cbddd3..9acf8ce 100644 --- a/example-app-spm/ios/App/CapApp-SPM/Package.swift +++ b/example-app-spm/ios/App/CapApp-SPM/Package.swift @@ -4,14 +4,14 @@ import PackageDescription // DO NOT MODIFY THIS FILE - managed by Capacitor CLI commands let package = Package( name: "CapApp-SPM", - platforms: [.iOS(.v14)], + platforms: [.iOS(.v15)], products: [ .library( name: "CapApp-SPM", targets: ["CapApp-SPM"]) ], dependencies: [ - .package(url: "https://github.com/ionic-team/capacitor-swift-pm.git", exact: "8.0.0"), + .package(url: "https://github.com/ionic-team/capacitor-swift-pm.git", exact: "8.0.1"), .package(name: "CapacitorBarcodeScanner", path: "../../../../plugin") ], targets: [ diff --git a/example-app-spm/package.json b/example-app-spm/package.json index 833e833..56ce8d4 100644 --- a/example-app-spm/package.json +++ b/example-app-spm/package.json @@ -46,4 +46,4 @@ "vitest": "^4.0.10" }, "description": "An Ionic project" -} +} \ No newline at end of file diff --git a/example-app/android/capacitor.settings.gradle b/example-app/android/capacitor.settings.gradle index 42b22b1..8fa0d2b 100644 --- a/example-app/android/capacitor.settings.gradle +++ b/example-app/android/capacitor.settings.gradle @@ -1,6 +1,6 @@ // DO NOT EDIT THIS FILE! IT IS GENERATED EACH TIME "capacitor update" IS RUN include ':capacitor-android' -project(':capacitor-android').projectDir = new File('../../node_modules/.pnpm/@capacitor+android@8.0.0-beta.0_@capacitor+core@8.0.0-beta.0/node_modules/@capacitor/android/capacitor') +project(':capacitor-android').projectDir = new File('../../node_modules/.pnpm/@capacitor+android@8.0.1_@capacitor+core@8.0.1/node_modules/@capacitor/android/capacitor') include ':capacitor-barcode-scanner' project(':capacitor-barcode-scanner').projectDir = new File('../../plugin/android') diff --git a/example-app/ios/App/App/Info.plist b/example-app/ios/App/App/Info.plist index b7212cb..085d71d 100644 --- a/example-app/ios/App/App/Info.plist +++ b/example-app/ios/App/App/Info.plist @@ -22,6 +22,8 @@ $(CURRENT_PROJECT_VERSION) LSRequiresIPhoneOS + NSCameraUsageDescription + Uses the camera to scan barcodes. UILaunchStoryboardName LaunchScreen UIMainStoryboardFile @@ -45,7 +47,5 @@ UIViewControllerBasedStatusBarAppearance - NSCameraUsageDescription - Uses the camera to scan barcodes. diff --git a/example-app/ios/App/Podfile b/example-app/ios/App/Podfile index 17c981e..b225cc9 100644 --- a/example-app/ios/App/Podfile +++ b/example-app/ios/App/Podfile @@ -1,4 +1,4 @@ -require_relative '../../../node_modules/.pnpm/@capacitor+ios@8.0.0-beta.0_@capacitor+core@8.0.0-beta.0/node_modules/@capacitor/ios/scripts/pods_helpers' +require_relative '../../../node_modules/.pnpm/@capacitor+ios@8.0.1_@capacitor+core@8.0.1/node_modules/@capacitor/ios/scripts/pods_helpers' platform :ios, '15.0' use_frameworks! @@ -9,8 +9,8 @@ use_frameworks! install! 'cocoapods', :disable_input_output_paths => true def capacitor_pods - pod 'Capacitor', :path => '../../../node_modules/.pnpm/@capacitor+ios@8.0.0-beta.0_@capacitor+core@8.0.0-beta.0/node_modules/@capacitor/ios' - pod 'CapacitorCordova', :path => '../../../node_modules/.pnpm/@capacitor+ios@8.0.0-beta.0_@capacitor+core@8.0.0-beta.0/node_modules/@capacitor/ios' + pod 'Capacitor', :path => '../../../node_modules/.pnpm/@capacitor+ios@8.0.1_@capacitor+core@8.0.1/node_modules/@capacitor/ios' + pod 'CapacitorCordova', :path => '../../../node_modules/.pnpm/@capacitor+ios@8.0.1_@capacitor+core@8.0.1/node_modules/@capacitor/ios' pod 'CapacitorBarcodeScanner', :path => '../../../plugin' end diff --git a/example-app/ios/App/Podfile.lock b/example-app/ios/App/Podfile.lock index 07e5a56..110541a 100644 --- a/example-app/ios/App/Podfile.lock +++ b/example-app/ios/App/Podfile.lock @@ -1,16 +1,16 @@ PODS: - - Capacitor (8.0.0-beta.0): + - Capacitor (8.0.1): - CapacitorCordova - - CapacitorBarcodeScanner (2.2.0): + - CapacitorBarcodeScanner (3.0.1): - Capacitor - OSBarcodeLib (= 2.0.1) - - CapacitorCordova (8.0.0-beta.0) + - CapacitorCordova (8.0.1) - OSBarcodeLib (2.0.1) DEPENDENCIES: - - "Capacitor (from `../../../node_modules/.pnpm/@capacitor+ios@8.0.0-beta.0_@capacitor+core@8.0.0-beta.0/node_modules/@capacitor/ios`)" + - "Capacitor (from `../../../node_modules/.pnpm/@capacitor+ios@8.0.1_@capacitor+core@8.0.1/node_modules/@capacitor/ios`)" - CapacitorBarcodeScanner (from `../../../plugin`) - - "CapacitorCordova (from `../../../node_modules/.pnpm/@capacitor+ios@8.0.0-beta.0_@capacitor+core@8.0.0-beta.0/node_modules/@capacitor/ios`)" + - "CapacitorCordova (from `../../../node_modules/.pnpm/@capacitor+ios@8.0.1_@capacitor+core@8.0.1/node_modules/@capacitor/ios`)" SPEC REPOS: trunk: @@ -18,18 +18,18 @@ SPEC REPOS: EXTERNAL SOURCES: Capacitor: - :path: "../../../node_modules/.pnpm/@capacitor+ios@8.0.0-beta.0_@capacitor+core@8.0.0-beta.0/node_modules/@capacitor/ios" + :path: "../../../node_modules/.pnpm/@capacitor+ios@8.0.1_@capacitor+core@8.0.1/node_modules/@capacitor/ios" CapacitorBarcodeScanner: :path: "../../../plugin" CapacitorCordova: - :path: "../../../node_modules/.pnpm/@capacitor+ios@8.0.0-beta.0_@capacitor+core@8.0.0-beta.0/node_modules/@capacitor/ios" + :path: "../../../node_modules/.pnpm/@capacitor+ios@8.0.1_@capacitor+core@8.0.1/node_modules/@capacitor/ios" SPEC CHECKSUMS: - Capacitor: cdbe01d8f7b542b2750fb51e88051e764b3cbc4e - CapacitorBarcodeScanner: 8de3b13b681ff3b92e21b286e9847ee525f44796 - CapacitorCordova: 65a0b71358d76bdeb799f45cd0214d68fbe2fd56 + Capacitor: ff35b0f66370b84aa238251b35b91886a3207c16 + CapacitorBarcodeScanner: cbd24d561545a5a1ba7d5f4328a285d347718c52 + CapacitorCordova: 0d65b9bb74e995dcecb9463f34f1af2aba6f955c OSBarcodeLib: 57987d2eb1f916f701f4554e20e349b3cb83f023 -PODFILE CHECKSUM: 4866a8bb908c1d799268ad9313d2a1aaab6530e6 +PODFILE CHECKSUM: 14c0fad0cafc209c7493f28f045312d0d635a678 COCOAPODS: 1.16.2 diff --git a/plugin/Package.swift b/plugin/Package.swift index 3e775f6..ece7156 100644 --- a/plugin/Package.swift +++ b/plugin/Package.swift @@ -11,7 +11,7 @@ let package = Package( ], dependencies: [ .package(url: "https://github.com/ionic-team/capacitor-swift-pm.git", from: "8.0.0"), - .package(url: "https://github.com/OutSystems/OSBarcodeLib-iOS.git", exact: "2.1.0") + .package(url: "https://github.com/OutSystems/OSBarcodeLib-iOS.git", from: "2.1.1") ], targets: [ .target(