Merge pull request #15 from OutSystems/development

RMET-3312 Barcode Plugin - Prepare release of version `1.1.0`

Author: alexgerardojacinto

CHANGELOG.md

@@ -6,17 +6,35 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 The changes documented here do not include those from the original repository.
 
+## [1.1.0]
+
+### Android
+
+#### Chores
+- Update library to include the zoom feature (https://outsystemsrd.atlassian.net/browse/RMET-2987).
+
+### iOS
+
+#### Chores
+- Update library to include the zoom feature (https://outsystemsrd.atlassian.net/browse/RMET-2986).
+
+#### Refactors
+- Replace `OSBARCArgumentMappable` static method with an initialiser.
+
 ## [1.0.0]
 
 ### iOS
 
-- Fix error codes and messages (https://outsystemsrd.atlassian.net/browse/RMET-3038).
+#### Features
 - Add `scanOrientation` argument to `scanBarcode` (https://outsystemsrd.atlassian.net/browse/RMET-2753).
 - Add `cameraDirection` argument to `scanBarcode` (https://outsystemsrd.atlassian.net/browse/RMET-2754).
 - Add `scanButtonText` argument to `scanBarcode` (https://outsystemsrd.atlassian.net/browse/RMET-2752).
 - Add `scanInstructions` argument to `scanBarcode` (https://outsystemsrd.atlassian.net/browse/RMET-2751).
 - Implement `scanBarcode` (https://outsystemsrd.atlassian.net/browse/RMET-2748).
 
+#### Fixes
+- Fix error codes and messages (https://outsystemsrd.atlassian.net/browse/RMET-3038).
+
 ### Android
 
 #### 09-01-2024

package.json

@@ -1,6 +1,6 @@
 {
   "name": "com.outsystems.plugins.barcode",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "Cordova Bridge for the OutSystems Officially Supported Barcode Plugin.",
   "keywords": [
     "ecosystem:cordova",

plugin.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<plugin id="com.outsystems.plugins.barcode" version="1.0.0" xmlns="http://apache.org/cordova/ns/plugins/1.0" xmlns:android="http://schemas.android.com/apk/res/android">
+<plugin id="com.outsystems.plugins.barcode" version="1.1.0" xmlns="http://apache.org/cordova/ns/plugins/1.0" xmlns:android="http://schemas.android.com/apk/res/android">
   <name>OSBarcode</name>
   <description>Cordova Bridge for the OutSystems Officially Supported Barcode Plugin.</description>
   <author>OutSystems Inc</author>

src/android/com/outsystems/plugins/barcode/build.gradle

@@ -29,7 +29,7 @@ apply plugin: 'kotlin-kapt'
 dependencies {
     implementation("com.github.outsystems:oscore-android:1.2.0@aar")
     implementation("com.github.outsystems:oscordova-android:2.0.0@aar")
-    implementation("com.github.outsystems:osbarcode-android:1.0.0@aar")
+    implementation("com.github.outsystems:osbarcode-android:1.1.0@aar")
 
     implementation 'androidx.appcompat:appcompat:1.4.1'
     implementation "androidx.activity:activity-ktx:1.4.0"

src/ios/OSBarcodeScanArgumentsModel.swift

@@ -1,4 +1,3 @@
-import Foundation
 import OSBarcodeLib
 
 struct OSBarcodeScanArgumentsModel: Decodable {
@@ -27,10 +26,10 @@ struct OSBarcodeScanArgumentsModel: Decodable {
         }
 
         let cameraDirectionInt = try container.decode(Int.self, forKey: .cameraDirection)
-        let cameraDirection = OSBARCCameraModel.map(value: cameraDirectionInt)
+        let cameraDirection = OSBARCCameraModel(value: cameraDirectionInt)
 
         let scanOrientationInt = try container.decode(Int.self, forKey: .scanOrientation)
-        let scanOrientation = OSBARCOrientationModel.map(value: scanOrientationInt)
+        let scanOrientation = OSBARCOrientationModel(value: scanOrientationInt)
 
         self.init(scanInstructions, scanButtonText, cameraDirection, scanOrientation)
     }

src/ios/frameworks/OSBARCArgumentMappable.swift

@@ -1,19 +1,19 @@
 import OSBarcodeLib
 
 protocol OSBARCArgumentMappable {
-    static func map(value: Int) -> Self
+    init(value: Int)
 }
 
 extension OSBARCCameraModel: OSBARCArgumentMappable {
-    static func map(value: Int) -> OSBARCCameraModel { value == 1 ? .back : .front }
+    init(value: Int) { self = value == 2 ? .front : .back }
 }
 
 extension OSBARCOrientationModel: OSBARCArgumentMappable {
-    static func map(value: Int) -> OSBARCOrientationModel {
+    init(value: Int) {
         switch value {
-        case 1: return .portrait
-        case 2: return .landscape
-        default: return .adaptive
+        case 1: self = .portrait
+        case 2: self = .landscape
+        default: self = .adaptive
         }
     }
 }

src/ios/frameworks/OSBarcodeLib.xcframework/Info.plist

@@ -6,30 +6,30 @@
 	<array>
 		<dict>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64</string>
+			<string>ios-arm64_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>OSBarcodeLib.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_x86_64-simulator</string>
+			<string>ios-arm64</string>
 			<key>LibraryPath</key>
 			<string>OSBarcodeLib.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
-				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>