chore: use native deps (#7)

ionic-team · Apr 15, 2024 · 5f6dc40 · 5f6dc40
1 parent 157ac68
commit 5f6dc40
Show file tree

Hide file tree

Showing 9 changed files with 1,715 additions and 1,611 deletions.
diff --git a/example-app/android/build.gradle b/example-app/android/build.gradle
@@ -21,6 +21,17 @@ allprojects {
     repositories {
         google()
         mavenCentral()
+        maven {
+            url 'https://pkgs.dev.azure.com/OutSystemsRD/9e79bc5b-69b2-4476-9ca5-d67594972a52/_packaging/PublicArtifactRepository/maven/v1'
+            name 'Azure'
+            credentials {
+                username = "optional"
+                password = ""
+            }
+            content {
+                includeGroup "com.github.outsystems"
+            }
+        }
     }
 }
 

diff --git a/example-app/android/capacitor.settings.gradle b/example-app/android/capacitor.settings.gradle
@@ -1,18 +1,18 @@
 // 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/@[email protected].0-rc.2_@[email protected]-rc.2/node_modules/@capacitor/android/capacitor')
+project(':capacitor-android').projectDir = new File('../../node_modules/.pnpm/@[email protected].0_@[email protected]/node_modules/@capacitor/android/capacitor')
 
 include ':capacitor-app'
-project(':capacitor-app').projectDir = new File('../../node_modules/.pnpm/@[email protected].0-rc.1_@[email protected]-rc.2/node_modules/@capacitor/app/android')
+project(':capacitor-app').projectDir = new File('../../node_modules/.pnpm/@[email protected].0_@[email protected]/node_modules/@capacitor/app/android')
 
 include ':capacitor-barcode-scanner'
 project(':capacitor-barcode-scanner').projectDir = new File('../../plugin/android')
 
 include ':capacitor-haptics'
-project(':capacitor-haptics').projectDir = new File('../../node_modules/.pnpm/@[email protected].0-rc.1_@[email protected]-rc.2/node_modules/@capacitor/haptics/android')
+project(':capacitor-haptics').projectDir = new File('../../node_modules/.pnpm/@[email protected].0_@[email protected]/node_modules/@capacitor/haptics/android')
 
 include ':capacitor-keyboard'
-project(':capacitor-keyboard').projectDir = new File('../../node_modules/.pnpm/@[email protected].0-rc.1_@[email protected]-rc.2/node_modules/@capacitor/keyboard/android')
+project(':capacitor-keyboard').projectDir = new File('../../node_modules/.pnpm/@[email protected].0_@[email protected]/node_modules/@capacitor/keyboard/android')
 
 include ':capacitor-status-bar'
-project(':capacitor-status-bar').projectDir = new File('../../node_modules/.pnpm/@[email protected].0-rc.1_@[email protected]-rc.2/node_modules/@capacitor/status-bar/android')
+project(':capacitor-status-bar').projectDir = new File('../../node_modules/.pnpm/@[email protected].0_@[email protected]/node_modules/@capacitor/status-bar/android')
diff --git a/example-app/ios/App/Podfile b/example-app/ios/App/Podfile
@@ -1,4 +1,4 @@
-require_relative '../../../node_modules/.pnpm/@[email protected].0-rc.2_@[email protected]-rc.2/node_modules/@capacitor/ios/scripts/pods_helpers'
+require_relative '../../../node_modules/.pnpm/@[email protected].0_@[email protected]/node_modules/@capacitor/ios/scripts/pods_helpers'
 
 platform :ios, '13.0'
 use_frameworks!
@@ -9,13 +9,13 @@ use_frameworks!
 install! 'cocoapods', :disable_input_output_paths => true
 
 def capacitor_pods
-  pod 'Capacitor', :path => '../../../node_modules/.pnpm/@[email protected].0-rc.2_@[email protected]-rc.2/node_modules/@capacitor/ios'
-  pod 'CapacitorCordova', :path => '../../../node_modules/.pnpm/@[email protected].0-rc.2_@[email protected]-rc.2/node_modules/@capacitor/ios'
-  pod 'CapacitorApp', :path => '../../../node_modules/.pnpm/@[email protected].0-rc.1_@[email protected]-rc.2/node_modules/@capacitor/app'
+  pod 'Capacitor', :path => '../../../node_modules/.pnpm/@[email protected].0_@[email protected]/node_modules/@capacitor/ios'
+  pod 'CapacitorCordova', :path => '../../../node_modules/.pnpm/@[email protected].0_@[email protected]/node_modules/@capacitor/ios'
+  pod 'CapacitorApp', :path => '../../../node_modules/.pnpm/@[email protected].0_@[email protected]/node_modules/@capacitor/app'
   pod 'CapacitorBarcodeScanner', :path => '../../../plugin'
-  pod 'CapacitorHaptics', :path => '../../../node_modules/.pnpm/@[email protected].0-rc.1_@[email protected]-rc.2/node_modules/@capacitor/haptics'
-  pod 'CapacitorKeyboard', :path => '../../../node_modules/.pnpm/@[email protected].0-rc.1_@[email protected]-rc.2/node_modules/@capacitor/keyboard'
-  pod 'CapacitorStatusBar', :path => '../../../node_modules/.pnpm/@[email protected].0-rc.1_@[email protected]-rc.2/node_modules/@capacitor/status-bar'
+  pod 'CapacitorHaptics', :path => '../../../node_modules/.pnpm/@[email protected].0_@[email protected]/node_modules/@capacitor/haptics'
+  pod 'CapacitorKeyboard', :path => '../../../node_modules/.pnpm/@[email protected].0_@[email protected]/node_modules/@capacitor/keyboard'
+  pod 'CapacitorStatusBar', :path => '../../../node_modules/.pnpm/@[email protected].0_@[email protected]/node_modules/@capacitor/status-bar'
 end
 
 target 'App' do

diff --git a/example-app/ios/App/Podfile.lock b/example-app/ios/App/Podfile.lock
@@ -1,59 +1,59 @@
 PODS:
-  - Capacitor (6.0.0-rc.2):
+  - Capacitor (6.0.0):
     - CapacitorCordova
-  - CapacitorApp (6.0.0-rc.1):
+  - CapacitorApp (6.0.0):
     - Capacitor
   - CapacitorBarcodeScanner (1.0.0-alpha.0):
     - Capacitor
-    - OSBarcodeLib (~> 1.0.0)
-  - CapacitorCordova (6.0.0-rc.2)
-  - CapacitorHaptics (6.0.0-rc.1):
+    - OSBarcodeLib (~> 1.1.0)
+  - CapacitorCordova (6.0.0)
+  - CapacitorHaptics (6.0.0):
     - Capacitor
-  - CapacitorKeyboard (6.0.0-rc.1):
+  - CapacitorKeyboard (6.0.0):
     - Capacitor
-  - CapacitorStatusBar (6.0.0-rc.1):
+  - CapacitorStatusBar (6.0.0):
     - Capacitor
-  - OSBarcodeLib (1.0.0)
+  - OSBarcodeLib (1.1.0)
 
 DEPENDENCIES:
-  - "Capacitor (from `../../../node_modules/.pnpm/@[email protected].0-rc.2_@[email protected]-rc.2/node_modules/@capacitor/ios`)"
-  - "CapacitorApp (from `../../../node_modules/.pnpm/@[email protected].0-rc.1_@[email protected]-rc.2/node_modules/@capacitor/app`)"
+  - "Capacitor (from `../../../node_modules/.pnpm/@[email protected].0_@[email protected]/node_modules/@capacitor/ios`)"
+  - "CapacitorApp (from `../../../node_modules/.pnpm/@[email protected].0_@[email protected]/node_modules/@capacitor/app`)"
   - CapacitorBarcodeScanner (from `../../../plugin`)
-  - "CapacitorCordova (from `../../../node_modules/.pnpm/@[email protected].0-rc.2_@[email protected]-rc.2/node_modules/@capacitor/ios`)"
-  - "CapacitorHaptics (from `../../../node_modules/.pnpm/@[email protected].0-rc.1_@[email protected]-rc.2/node_modules/@capacitor/haptics`)"
-  - "CapacitorKeyboard (from `../../../node_modules/.pnpm/@[email protected].0-rc.1_@[email protected]-rc.2/node_modules/@capacitor/keyboard`)"
-  - "CapacitorStatusBar (from `../../../node_modules/.pnpm/@[email protected].0-rc.1_@[email protected]-rc.2/node_modules/@capacitor/status-bar`)"
+  - "CapacitorCordova (from `../../../node_modules/.pnpm/@[email protected].0_@[email protected]/node_modules/@capacitor/ios`)"
+  - "CapacitorHaptics (from `../../../node_modules/.pnpm/@[email protected].0_@[email protected]/node_modules/@capacitor/haptics`)"
+  - "CapacitorKeyboard (from `../../../node_modules/.pnpm/@[email protected].0_@[email protected]/node_modules/@capacitor/keyboard`)"
+  - "CapacitorStatusBar (from `../../../node_modules/.pnpm/@[email protected].0_@[email protected]/node_modules/@capacitor/status-bar`)"
 
 SPEC REPOS:
   trunk:
     - OSBarcodeLib
 
 EXTERNAL SOURCES:
   Capacitor:
-    :path: "../../../node_modules/.pnpm/@[email protected].0-rc.2_@[email protected]-rc.2/node_modules/@capacitor/ios"
+    :path: "../../../node_modules/.pnpm/@[email protected].0_@[email protected]/node_modules/@capacitor/ios"
   CapacitorApp:
-    :path: "../../../node_modules/.pnpm/@[email protected].0-rc.1_@[email protected]-rc.2/node_modules/@capacitor/app"
+    :path: "../../../node_modules/.pnpm/@[email protected].0_@[email protected]/node_modules/@capacitor/app"
   CapacitorBarcodeScanner:
     :path: "../../../plugin"
   CapacitorCordova:
-    :path: "../../../node_modules/.pnpm/@[email protected].0-rc.2_@[email protected]-rc.2/node_modules/@capacitor/ios"
+    :path: "../../../node_modules/.pnpm/@[email protected].0_@[email protected]/node_modules/@capacitor/ios"
   CapacitorHaptics:
-    :path: "../../../node_modules/.pnpm/@[email protected].0-rc.1_@[email protected]-rc.2/node_modules/@capacitor/haptics"
+    :path: "../../../node_modules/.pnpm/@[email protected].0_@[email protected]/node_modules/@capacitor/haptics"
   CapacitorKeyboard:
-    :path: "../../../node_modules/.pnpm/@[email protected].0-rc.1_@[email protected]-rc.2/node_modules/@capacitor/keyboard"
+    :path: "../../../node_modules/.pnpm/@[email protected].0_@[email protected]/node_modules/@capacitor/keyboard"
   CapacitorStatusBar:
-    :path: "../../../node_modules/.pnpm/@[email protected].0-rc.1_@[email protected]-rc.2/node_modules/@capacitor/status-bar"
+    :path: "../../../node_modules/.pnpm/@[email protected].0_@[email protected]/node_modules/@capacitor/status-bar"
 
 SPEC CHECKSUMS:
-  Capacitor: 616838064c270088c3c51e0bb2f57259c09f3d55
-  CapacitorApp: 649eca1980ddb28d43177bc78b252123e243b848
-  CapacitorBarcodeScanner: 2c52ec265dcf61c15f471f61bbbbdfd85269112d
-  CapacitorCordova: 62056f853503fb402c3bd9ea9b93b30f23d1c1ce
-  CapacitorHaptics: b004f0eb5b1cbef124889ccf745679f3aa9568ef
-  CapacitorKeyboard: 683563ad6b13c1a46bfc710d49b4621570feef48
-  CapacitorStatusBar: 31febfff4331f2e800847abdac79d64f04eb4206
-  OSBarcodeLib: e5075922166a0140d7e22218efe904a4b359f056
+  Capacitor: 559d073c4ca6c27f8e7002c807eea94c3ba435a9
+  CapacitorApp: 9d53aec7101f7b030a950c5bdc4df8612576b279
+  CapacitorBarcodeScanner: 80444aa11d911dac09a6af454560db735de81ee6
+  CapacitorCordova: 8c4bfdf69368512e85b1d8b724dd7546abeb30af
+  CapacitorHaptics: 9ebc9363f0e9b8eb4295088a0b474530acf1859b
+  CapacitorKeyboard: deacbd09d8d1029c3681197fb05d206b721d5f73
+  CapacitorStatusBar: 2e4369f99166125435641b1908d05f561eaba6f6
+  OSBarcodeLib: ced133bc1ec073636e18c6a0553d0a5c4b90cf17
 
-PODFILE CHECKSUM: e4140fc02500ab3a454d73af10000b75805fc486
+PODFILE CHECKSUM: 1d6169ce9a8e5c5a436844292f343842268f688b
 
 COCOAPODS: 1.15.2
diff --git a/example-app/package.json b/example-app/package.json
@@ -12,14 +12,14 @@
     "lint": "eslint"
   },
   "dependencies": {
-    "@capacitor/android": "next",
-    "@capacitor/app": "next",
+    "@capacitor/android": "^6.0.0",
+    "@capacitor/app": "^6.0.0",
     "@capacitor/barcode-scanner": "workspace:*",
-    "@capacitor/core": "next",
-    "@capacitor/haptics": "next",
-    "@capacitor/ios": "next",
-    "@capacitor/keyboard": "next",
-    "@capacitor/status-bar": "next",
+    "@capacitor/core": "^6.0.0",
+    "@capacitor/haptics": "^6.0.0",
+    "@capacitor/ios": "^6.0.0",
+    "@capacitor/keyboard": "^6.0.0",
+    "@capacitor/status-bar": "^6.0.0",
     "@ionic/react": "^7.0.0",
     "@ionic/react-router": "^7.0.0",
     "@types/react-router": "^5.1.20",
@@ -31,7 +31,7 @@
     "react-router-dom": "^5.3.4"
   },
   "devDependencies": {
-    "@capacitor/cli": "next",
+    "@capacitor/cli": "^6.0.0",
     "@testing-library/dom": ">=7.21.4",
     "@testing-library/jest-dom": "^5.16.5",
     "@testing-library/react": "^14.0.0",

diff --git a/plugin/CapacitorBarcodeScanner.podspec b/plugin/CapacitorBarcodeScanner.podspec
@@ -13,6 +13,6 @@ Pod::Spec.new do |s|
   s.source_files = 'ios/Plugin/**/*.{swift,h,m,c,cc,mm,cpp}'
   s.ios.deployment_target  = '13.0'
   s.dependency 'Capacitor'
-  s.dependency 'OSBarcodeLib', '~> 1.0.0'
+  s.dependency 'OSBarcodeLib', '~> 1.1.0'
   s.swift_version = '5.1'
 end
diff --git a/plugin/android/build.gradle b/plugin/android/build.gradle
@@ -77,7 +77,7 @@ repositories {
 
 dependencies {
     // implementation fileTree(dir: 'libs', include: ['*.aar', '*.jar'])
-    implementation "com.github.outsystems:osbarcode-android:1.0.1@aar"
+    implementation "com.github.outsystems:osbarcode-android:[1.0.1, 2.0.0[@aar"
     implementation project(':capacitor-android')
     implementation "androidx.appcompat:appcompat:$androidxAppCompatVersion"
     implementation 'androidx.activity:activity-ktx:1.8.2'

diff --git a/plugin/package.json b/plugin/package.json
@@ -48,10 +48,10 @@
     "html5-qrcode": "2.3.8"
   },
   "devDependencies": {
-    "@capacitor/android": "next",
-    "@capacitor/core": "next",
+    "@capacitor/android": "^6.0.0",
+    "@capacitor/core": "^6.0.0",
     "@capacitor/docgen": "^0.2.2",
-    "@capacitor/ios": "next",
+    "@capacitor/ios": "^6.0.0",
     "@ionic/swiftlint-config": "^1.1.2",
     "@types/node": "~20.12.4",
     "@typescript-eslint/eslint-plugin": "^5.59.2",
@@ -66,7 +66,7 @@
     "typescript": "^5.4.2"
   },
   "peerDependencies": {
-    "@capacitor/core": "next"
+    "@capacitor/core": "^6.0.0"
   },
   "swiftlint": "@ionic/swiftlint-config",
   "capacitor": {