Master

Package.swift

@@ -0,0 +1,74 @@
+// swift-tools-version:5.1
+// The swift-tools-version declares the minimum version of Swift required to build this package.
+
+import PackageDescription
+
+let package = Package(
+    name: "ZXingObjC",
+    products: [
+        // Products define the executables and libraries produced by a package, and make them visible to other packages.
+        .library(
+            name: "ZXingObjC",
+            targets: ["ZXingObjC"]
+        ),
+    ],
+    dependencies: [
+        // Dependencies declare other packages that this package depends on.
+    ],
+    targets: [
+        // Targets are the basic building blocks of a package. A target can define a module or a test suite.
+        // Targets can depend on other targets in this package, and on products in packages which this package depends on.
+        .target(
+            name: "ZXingObjC",
+            dependencies: [],
+            path: "ZXingObjC",
+            publicHeadersPath: "include",
+            cxxSettings: [
+                .headerSearchPath("aztec"),
+                .headerSearchPath("aztec/decoder"),
+                .headerSearchPath("aztec/detector"),
+                .headerSearchPath("aztec/encoder"),
+
+                .headerSearchPath("client"),
+                .headerSearchPath("client/result"),
+
+                .headerSearchPath("common"),
+                .headerSearchPath("common/detector"),
+                .headerSearchPath("common/reedsolomon"),
+
+                .headerSearchPath("core"),
+
+                .headerSearchPath("datamatrix"),
+                .headerSearchPath("datamatrix/decoder"),
+                .headerSearchPath("datamatrix/detector"),
+                .headerSearchPath("datamatrix/encoder"),
+
+                .headerSearchPath("maxicode"),
+                .headerSearchPath("maxicode/decoder"),
+
+                .headerSearchPath("multi"),
+
+                .headerSearchPath("oned"),
+                .headerSearchPath("oned/rss"),
+                .headerSearchPath("oned/rss/expanded"),
+                .headerSearchPath("oned/rss/expanded/decoders"),
+
+                .headerSearchPath("pdf417"),
+                .headerSearchPath("pdf417/decoder"),
+                .headerSearchPath("pdf417/decoder/ec"),
+                .headerSearchPath("pdf417/detector"),
+                .headerSearchPath("pdf417/encoder"),
+
+                .headerSearchPath("qrcode"),
+                .headerSearchPath("qrcode/decoder"),
+                .headerSearchPath("qrcode/detector"),
+                .headerSearchPath("qrcode/encoder"),
+                .headerSearchPath("qrcode/multi"),
+                .headerSearchPath("qrcode/multi/detector"),
+            ],
+            linkerSettings: [
+              .unsafeFlags(["-fprofile-instr-generate"])
+            ]
+        )
+    ]
+)

README.md

@@ -1,5 +1,4 @@
-ZXingObjC
-=========
+# zxingify-objc
 
 ZXingObjC is a full Objective-C port of [ZXing](https://github.com/zxing/zxing) ("Zebra Crossing"), a Java barcode image processing library. It is designed to be used on both iOS devices and in Mac applications.
 
@@ -15,14 +14,15 @@ The following barcodes are currently supported for both encoding and decoding:
 * RSS-14 (all variants)
 * QR Code
 * Data Matrix
+* Maxicode
 * Aztec ('beta' quality)
-* PDF 417 ('alpha' quality)
+* PDF 417 ('beta' quality)
 
-ZXingObjC currently has feature parity with ZXing version 3.0.
+ZXingObjC currently has feature parity with ZXing version 3.3.3.
 
 ## Requirements
 
-ZXingObjC requires Xcode 5, targeting either iOS 6.0 and above, or Mac OS X 10.8 Mountain Lion and above.
+ZXingObjC requires Xcode 13.0 and above, targeting either iOS 11.0 and above, or Mac OS X 10.15 Catalina and above.
 
 ## Usage
 
@@ -37,9 +37,11 @@ ZXBitMatrix* result = [writer encode:@"A string to encode"
                               height:500
                                error:&error];
 if (result) {
-  CGImageRef image = [[ZXImage imageWithMatrix:result] cgimage];
+  CGImageRef image = CGImageRetain([[ZXImage imageWithMatrix:result] cgimage]);
 
   // This CGImageRef image can be placed in a UIImage, NSImage, or written to a file.
+
+  CGImageRelease(image);
 } else {
   NSString *errorMessage = [error localizedDescription];
 }
@@ -78,20 +80,37 @@ if (result) {
 
 ## Installation
 
-The recommended way to install ZXingObjC is with [CocoaPods](http://cocoapods.org), a dependency mananger for Objective-C projects. After installing CocoaPods just add ZXingObjC to your Podfile:
+We highly recommend Carthage as module manager.
+
+#### Carthage
+
+ZXingObjC can be installed using [Carthage](https://github.com/Carthage/Carthage). After installing Carthage just add ZXingObjC to your Cartfile:
+
+```ogdl
+github "zxingify/zxingify-objc" ~> 3.6.9
+```
+
+#### CocoaPods
+
+[CocoaPods](http://cocoapods.org) is a dependency manager for Swift and Objective-C Cocoa projects. After installing CocoaPods add ZXingObjC to your Podfile:
 
 ```ruby
-platform :ios, '7.0'
-pod 'ZXingObjC', '~> 3.0'
+platform :ios, '11.0'
+pod 'ZXingObjC', '~> 3.6.9'
 ```
 
 ## Examples
 
 ZXingObjC includes several example applications found in "examples" folder:
 
 * BarcodeScanner - An iOS application that captures video from the camera, scans for barcodes and displays results on screen.
-* BarcodeScannerOSX - An OS X application that captures video from the camera, scans for barcodes and displays results on screen.
-* QrCodeTest - A basic QR code generator that accepts input, encodes it as a QR code, and displays it on screen.
+* BarcodeScannerSwift - An iOS application that captures video from the camera, scans for barcodes and displays results on screen, completely rewritten in Swift.
+
+## Kudos
+
+- [cwalcott](https://github.com/cwalcott) initial creator of this project
+- [neacao](https://github.com/neacao) for his unparalleled support lately
+- [claybridges](https://github.com/claybridges) for all the help regarding the project move
 
 ## License
 

ZXingObjC.podspec

@@ -1,16 +1,16 @@
 Pod::Spec.new do |s|
   s.name = 'ZXingObjC'
-  s.version = '3.1.0'
+  s.version = '3.6.9'
   s.summary = 'An Objective-C Port of the ZXing barcode framework.'
-  s.homepage = 'https://github.com/TheLevelUp/ZXingObjC'
-  s.author = 'ZXingObjC team'
+  s.homepage = 'https://github.com/zxingify/zxingify-objc'
+  s.author = 'zxingify'
   s.license = { :type => 'Apache License 2.0', :file => 'COPYING' }
-  s.source = { :git => 'https://github.com/TheLevelUp/ZXingObjC.git', :tag => "#{s.version}" }
+  s.source = { :git => 'https://github.com/zxingify/zxingify-objc.git', :tag => "#{s.version}" }
   s.requires_arc = true
   s.xcconfig = { "OTHER_LDFLAGS" => "-ObjC" }
 
-  s.ios.deployment_target = '6.0'
-  s.osx.deployment_target = '10.8'
+  s.ios.deployment_target = '11.0'
+  s.osx.deployment_target = '10.15'
 
   s.ios.frameworks = 'AVFoundation', 'CoreGraphics', 'CoreMedia', 'CoreVideo', 'ImageIO', 'QuartzCore'
   s.osx.frameworks = 'AVFoundation', 'CoreMedia', 'QuartzCore'
@@ -19,10 +19,12 @@ Pod::Spec.new do |s|
 
   s.subspec 'All' do |ss|
     ss.source_files = 'ZXingObjC/**/*.{h,m}'
+    ss.exclude_files = 'ZXingObjC/include/**/*.h'
   end
 
   s.subspec 'Core' do |ss|
     ss.source_files = 'ZXingObjC/*.{h,m}', 'ZXingObjC/client/*.{h,m}', 'ZXingObjC/common/**/*.{h,m}', 'ZXingObjC/core/**/*.{h,m}', 'ZXingObjC/multi/**/*.{h,m}'
+    ss.xcconfig = { "GCC_PREPROCESSOR_DEFINITIONS" => "ZXINGOBJC_USE_SUBSPECS" }
   end
 
   s.subspec 'Aztec' do |ss|