Version bump: 3.0.0

onetech-toantm · Apr 29, 2014 · 2630b0c · 2630b0c
1 parent 977f364
commit 2630b0c
Show file tree

Hide file tree

Showing 9 changed files with 70 additions and 96 deletions.
diff --git a/ZXingObjC.podspec b/ZXingObjC.podspec
@@ -1,12 +1,11 @@
 Pod::Spec.new do |s|
   s.name = 'ZXingObjC'
-  s.version = '3.0.0-alpha.1'
+  s.version = '3.0.0'
   s.summary = 'An Objective-C Port of the ZXing barcode framework.'
   s.homepage = 'https://github.com/TheLevelUp/ZXingObjC'
   s.author = 'ZXingObjC team'
   s.license = { :type => 'Apache License 2.0', :file => 'COPYING' }
   s.source = { :git => 'https://github.com/TheLevelUp/ZXingObjC.git', :tag => "#{s.version}" }
-  s.source_files = 'ZXingObjC/**/*.{h,m}'
   s.requires_arc = true
   s.xcconfig = { "OTHER_LDFLAGS" => "-ObjC" }
 
@@ -16,9 +15,15 @@ Pod::Spec.new do |s|
   s.ios.frameworks = 'AVFoundation', 'CoreGraphics', 'CoreMedia', 'CoreVideo', 'ImageIO', 'QuartzCore'
   s.osx.frameworks = 'AVFoundation', 'CoreMedia', 'QuartzCore'
 
+  s.default_subspec = 'All'
+
+  s.subspec 'All' do |ss|
+    ss.source_files = 'ZXingObjC/**/*.{h,m}'
+  end
+
   s.subspec 'Aztec' do |ss|
     ss.dependency 'ZXingObjC/Core'
-    ss.source_files = 'ZXingObjC/aztec/*.{h,m}'
+    ss.source_files = 'ZXingObjC/aztec/**/*.{h,m}'
   end
 
   s.subspec 'Core' do |ss|
@@ -37,16 +42,11 @@ Pod::Spec.new do |s|
 
   s.subspec 'OneD' do |ss|
     ss.dependency 'ZXingObjC/Core'
-    ss.source_files = 'ZXingObjC/oned/**/*.{h,m}'
+    ss.source_files = 'ZXingObjC/oned/**/*.{h,m}', 'ZXingObjC/client/result/*.{h,m}'
   end
 
   s.subspec 'QRCode' do |ss|
     ss.dependency 'ZXingObjC/Core'
     ss.source_files = 'ZXingObjC/qrcode/**/*.{h,m}'
   end
-
-  s.subspec 'ResultParsers' do |ss|
-    ss.dependency 'ZXingObjC/Core'
-    ss.source_files = 'ZXingObjC/client/result/*.{h,m}'
-  end
 end
diff --git a/ZXingObjC.xcodeproj/project.pbxproj b/ZXingObjC.xcodeproj/project.pbxproj
diff --git a/ZXingObjC/client/result/ZXingObjCResultParsers.h b/ZXingObjC/client/result/ZXingObjCResultParsers.h
diff --git a/ZXingObjC/qrcode/encoder/ZXByteMatrix.h → ZXingObjC/core/ZXByteMatrix.h b/ZXingObjC/qrcode/encoder/ZXByteMatrix.h → ZXingObjC/core/ZXByteMatrix.h
diff --git a/ZXingObjC/qrcode/encoder/ZXByteMatrix.m → ZXingObjC/core/ZXByteMatrix.m b/ZXingObjC/qrcode/encoder/ZXByteMatrix.m → ZXingObjC/core/ZXByteMatrix.m
diff --git a/ZXingObjC/core/ZXingObjCCore.h b/ZXingObjC/core/ZXingObjCCore.h
@@ -51,6 +51,7 @@
 #import "ZXBarcodeFormat.h"
 #import "ZXBinarizer.h"
 #import "ZXBinaryBitmap.h"
+#import "ZXByteMatrix.h"
 #import "ZXDecodeHints.h"
 #import "ZXDimension.h"
 #import "ZXEncodeHints.h"

diff --git a/ZXingObjC/datamatrix/decoder/ZXDataMatrixDataBlock.m b/ZXingObjC/datamatrix/decoder/ZXDataMatrixDataBlock.m
@@ -17,7 +17,6 @@
 #import "ZXByteArray.h"
 #import "ZXDataMatrixDataBlock.h"
 #import "ZXDataMatrixVersion.h"
-#import "ZXQRCodeVersion.h"
 
 @implementation ZXDataMatrixDataBlock
 

diff --git a/ZXingObjC/oned/ZXingObjCOneD.h b/ZXingObjC/oned/ZXingObjCOneD.h
@@ -18,6 +18,8 @@
 
 #define _ZXINGOBJC_ONED_
 
+// OneD
+
 #import "ZXAbstractExpandedDecoder.h"
 #import "ZXAbstractRSSReader.h"
 #import "ZXCodaBarReader.h"
@@ -48,4 +50,43 @@
 #import "ZXUPCEANWriter.h"
 #import "ZXUPCEReader.h"
 
+// Result Parsers
+
+#import "ZXAddressBookAUResultParser.h"
+#import "ZXAddressBookDoCoMoResultParser.h"
+#import "ZXAddressBookParsedResult.h"
+#import "ZXBizcardResultParser.h"
+#import "ZXBookmarkDoCoMoResultParser.h"
+#import "ZXCalendarParsedResult.h"
+#import "ZXEmailAddressParsedResult.h"
+#import "ZXEmailAddressResultParser.h"
+#import "ZXEmailDoCoMoResultParser.h"
+#import "ZXExpandedProductParsedResult.h"
+#import "ZXExpandedProductResultParser.h"
+#import "ZXGeoParsedResult.h"
+#import "ZXGeoResultParser.h"
+#import "ZXISBNParsedResult.h"
+#import "ZXISBNResultParser.h"
+#import "ZXParsedResult.h"
+#import "ZXParsedResultType.h"
+#import "ZXProductParsedResult.h"
+#import "ZXProductResultParser.h"
+#import "ZXResultParser.h"
+#import "ZXSMSMMSResultParser.h"
+#import "ZXSMSParsedResult.h"
+#import "ZXSMSTOMMSTOResultParser.h"
+#import "ZXSMTPResultParser.h"
+#import "ZXTelParsedResult.h"
+#import "ZXTelResultParser.h"
+#import "ZXTextParsedResult.h"
+#import "ZXURIParsedResult.h"
+#import "ZXURIResultParser.h"
+#import "ZXURLTOResultParser.h"
+#import "ZXVCardResultParser.h"
+#import "ZXVEventResultParser.h"
+#import "ZXVINParsedResult.h"
+#import "ZXVINResultParser.h"
+#import "ZXWifiParsedResult.h"
+#import "ZXWifiResultParser.h"
+
 #endif
diff --git a/ZXingObjC/qrcode/ZXingObjCQRCode.h b/ZXingObjC/qrcode/ZXingObjCQRCode.h
@@ -20,7 +20,6 @@
 
 #define _ZXINGOBJC_QRCODE_
 
-#import "ZXByteMatrix.h"
 #import "ZXQRCode.h"
 #import "ZXQRCodeAlignmentPattern.h"
 #import "ZXQRCodeDecoder.h"