Merge pull request #12 from cslrfid/develop

Develop
cslrfid · Aug 7, 2023 · d3abaf5 · d3abaf5
2 parents 2dcf913 + 1c8950b
commit d3abaf5
Show file tree

Hide file tree

Showing 27 changed files with 511 additions and 490 deletions.
diff --git a/CS710iOSClient.xcodeproj/project.pbxproj b/CS710iOSClient.xcodeproj/project.pbxproj
@@ -589,7 +589,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.6;
+				MARKETING_VERSION = 0.7;
 				PRODUCT_BUNDLE_IDENTIFIER = com.csl.CS710SiOSClient;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -616,7 +616,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.6;
+				MARKETING_VERSION = 0.7;
 				PRODUCT_BUNDLE_IDENTIFIER = com.csl.CS710SiOSClient;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

diff --git a/CS710iOSClient/Info.plist b/CS710iOSClient/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
-	<string>100</string>
+	<string>114</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSBluetoothAlwaysUsageDescription</key>

diff --git a/Podfile b/Podfile
@@ -3,5 +3,5 @@ use_frameworks!
 
 target 'CS710iOSClient' do
   pod 'MQTTClient'
-  pod 'CSL-CS710', :path => '~/Documents/GitHub/CSL-CS710/'
+  pod 'CSL-CS710S', :path => '~/Documents/GitHub/CSL-CS710S/'
 end
diff --git a/Podfile.lock b/Podfile.lock
@@ -1,5 +1,5 @@
 PODS:
-  - CSL-CS710 (0.4.0):
+  - CSL-CS710S (0.5.0):
     - MQTTClient
   - MQTTClient (0.15.2):
     - MQTTClient/Core (= 0.15.2)
@@ -11,21 +11,21 @@ PODS:
   - MQTTClient/Min (0.15.2)
 
 DEPENDENCIES:
-  - CSL-CS710 (from `~/Documents/GitHub/CSL-CS710/`)
+  - CSL-CS710S (from `~/Documents/GitHub/CSL-CS710S/`)
   - MQTTClient
 
 SPEC REPOS:
   trunk:
     - MQTTClient
 
 EXTERNAL SOURCES:
-  CSL-CS710:
-    :path: "~/Documents/GitHub/CSL-CS710/"
+  CSL-CS710S:
+    :path: "~/Documents/GitHub/CSL-CS710S/"
 
 SPEC CHECKSUMS:
-  CSL-CS710: f222f72cf29b01f6087158bcb78a2de140f28cb3
+  CSL-CS710S: 7ecff66a2fcf31ed93aec60a142f7d47174f5545
   MQTTClient: 902c7bcac1501595f3d0b15178c7205b40331fb0
 
-PODFILE CHECKSUM: c7b74b2b04b20d54a8f0341b3bbf877c1880600f
+PODFILE CHECKSUM: 0b7648f81222d48fbecb33da0f2796706fcca4de
 
 COCOAPODS: 1.11.3
diff --git a/Pods/Local Podspecs/CSL-CS710.podspec.json b/Pods/Local Podspecs/CSL-CS710.podspec.json
diff --git a/Pods/Local Podspecs/CSL-CS710S.podspec.json b/Pods/Local Podspecs/CSL-CS710S.podspec.json
diff --git a/Pods/Manifest.lock b/Pods/Manifest.lock
diff --git a/Pods/Pods.xcodeproj/project.pbxproj b/Pods/Pods.xcodeproj/project.pbxproj
diff --git a/Pods/Pods.xcodeproj/xcuserdata/TurtleMac01.xcuserdatad/xcschemes/xcschememanagement.plist b/Pods/Pods.xcodeproj/xcuserdata/TurtleMac01.xcuserdatad/xcschemes/xcschememanagement.plist
diff --git a/Pods/Target Support Files/CSL-CS710/CSL-CS710-dummy.m b/Pods/Target Support Files/CSL-CS710/CSL-CS710-dummy.m
diff --git a/Pods/Target Support Files/CSL-CS710/CSL-CS710.modulemap b/Pods/Target Support Files/CSL-CS710/CSL-CS710.modulemap
diff --git a/...port Files/CSL-CS710/CSL-CS710-Info.plist → ...rt Files/CSL-CS710S/CSL-CS710S-Info.plist b/...port Files/CSL-CS710/CSL-CS710-Info.plist → ...rt Files/CSL-CS710S/CSL-CS710S-Info.plist
diff --git a/Pods/Target Support Files/CSL-CS710S/CSL-CS710S-dummy.m b/Pods/Target Support Files/CSL-CS710S/CSL-CS710S-dummy.m
diff --git a/...port Files/CSL-CS710/CSL-CS710-prefix.pch → ...rt Files/CSL-CS710S/CSL-CS710S-prefix.pch b/...port Files/CSL-CS710/CSL-CS710-prefix.pch → ...rt Files/CSL-CS710S/CSL-CS710S-prefix.pch
diff --git a/...port Files/CSL-CS710/CSL-CS710-umbrella.h → ...rt Files/CSL-CS710S/CSL-CS710S-umbrella.h b/...port Files/CSL-CS710/CSL-CS710-umbrella.h → ...rt Files/CSL-CS710S/CSL-CS710S-umbrella.h
diff --git a/...iles/CSL-CS710/CSL-CS710.release.xcconfig → ...iles/CSL-CS710S/CSL-CS710S.debug.xcconfig b/...iles/CSL-CS710/CSL-CS710.release.xcconfig → ...iles/CSL-CS710S/CSL-CS710S.debug.xcconfig
diff --git a/Pods/Target Support Files/CSL-CS710S/CSL-CS710S.modulemap b/Pods/Target Support Files/CSL-CS710S/CSL-CS710S.modulemap
diff --git a/... Files/CSL-CS710/CSL-CS710.debug.xcconfig → ...es/CSL-CS710S/CSL-CS710S.release.xcconfig b/... Files/CSL-CS710/CSL-CS710.debug.xcconfig → ...es/CSL-CS710S/CSL-CS710S.release.xcconfig
diff --git a/...Support Files/Pods-CS710iOSClient/Pods-CS710iOSClient-acknowledgements.markdown b/...Support Files/Pods-CS710iOSClient/Pods-CS710iOSClient-acknowledgements.markdown
diff --git a/Pods/Target Support Files/Pods-CS710iOSClient/Pods-CS710iOSClient-acknowledgements.plist b/Pods/Target Support Files/Pods-CS710iOSClient/Pods-CS710iOSClient-acknowledgements.plist
diff --git a/...ort Files/Pods-CS710iOSClient/Pods-CS710iOSClient-frameworks-Debug-input-files.xcfilelist b/...ort Files/Pods-CS710iOSClient/Pods-CS710iOSClient-frameworks-Debug-input-files.xcfilelist
diff --git a/...rt Files/Pods-CS710iOSClient/Pods-CS710iOSClient-frameworks-Debug-output-files.xcfilelist b/...rt Files/Pods-CS710iOSClient/Pods-CS710iOSClient-frameworks-Debug-output-files.xcfilelist
diff --git a/...t Files/Pods-CS710iOSClient/Pods-CS710iOSClient-frameworks-Release-input-files.xcfilelist b/...t Files/Pods-CS710iOSClient/Pods-CS710iOSClient-frameworks-Release-input-files.xcfilelist
diff --git a/... Files/Pods-CS710iOSClient/Pods-CS710iOSClient-frameworks-Release-output-files.xcfilelist b/... Files/Pods-CS710iOSClient/Pods-CS710iOSClient-frameworks-Release-output-files.xcfilelist
diff --git a/Pods/Target Support Files/Pods-CS710iOSClient/Pods-CS710iOSClient-frameworks.sh b/Pods/Target Support Files/Pods-CS710iOSClient/Pods-CS710iOSClient-frameworks.sh
diff --git a/Pods/Target Support Files/Pods-CS710iOSClient/Pods-CS710iOSClient.debug.xcconfig b/Pods/Target Support Files/Pods-CS710iOSClient/Pods-CS710iOSClient.debug.xcconfig
diff --git a/Pods/Target Support Files/Pods-CS710iOSClient/Pods-CS710iOSClient.release.xcconfig b/Pods/Target Support Files/Pods-CS710iOSClient/Pods-CS710iOSClient.release.xcconfig