Merge branch release/3.0.4

Author: rakuyoMo

ColaCup.podspec

@@ -5,19 +5,19 @@ Pod::Spec.new do |s|
 
   s.name             = 'ColaCup'
 
-  s.version          = '3.0.3'
+  s.version          = '3.0.4'
 
   s.summary          = '🥤 A tool for viewing logs. Use with RaLog.'
 
   s.description      = '🥤 A tool for viewing logs. Use with RaLog.'
 
-  s.homepage         = 'https://github.com/rakuyoMo/ColaCup'
+  s.homepage         = 'https://github.com/RakuyoKit/ColaCup'
 
   s.license          = 'MIT'
 
   s.author           = { 'Rakuyo' => '[email protected]' }
 
-  s.source           = { :git => 'https://github.com/rakuyoMo/ColaCup.git', :tag => s.version.to_s }
+  s.source           = { :git => 'https://github.com/RakuyoKit/ColaCup.git', :tag => s.version.to_s }
 
   s.requires_arc     = true
 

ColaCup.xcodeproj/project.pbxproj

@@ -729,7 +729,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = "";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 14;
+				CURRENT_PROJECT_VERSION = 15;
 				DEVELOPMENT_TEAM = 5C9JW4S9DE;
 				INFOPLIST_FILE = "$(SRCROOT)/ColaCup/Other/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
@@ -753,7 +753,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = "";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 14;
+				CURRENT_PROJECT_VERSION = 15;
 				DEVELOPMENT_TEAM = 5C9JW4S9DE;
 				INFOPLIST_FILE = "$(SRCROOT)/ColaCup/Other/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 10.0;

ColaCup/Core/Filter/FilterDateCell.swift

@@ -19,26 +19,26 @@ public class FilterDateCell: UICollectionViewCell {
         config()
     }
 
-    @available(iOS 13.4, *)
-    public lazy var datePicker: UIDatePicker = {
+    private lazy var _datePicker: UIDatePicker = {
         let datePicker = UIDatePicker()
         datePicker.translatesAutoresizingMaskIntoConstraints = false
-        datePicker.tintColor = .label
-        
         datePicker.datePickerMode = .date
         datePicker.maximumDate = Date()
-        datePicker.preferredDatePickerStyle = .compact
+        
         datePicker.subviews[0].subviews[0].subviews[0].alpha = 0
 
-        datePicker.addTarget(self, action: #selector(datePickerDidEditingEnd(_:)), for: .editingDidEnd)
+        if #available(iOS 13.0, *) {
+            datePicker.tintColor = .label
+        }
+        
+        if #available(iOS 13.4, *) {
+            datePicker.preferredDatePickerStyle = .compact
+            datePicker.addTarget(self, action: #selector(datePickerDidEditingEnd(_:)), for: .editingDidEnd)
+        }
 
         return datePicker
     }()
 
-    /// The callback after the user selects the date.
-    @available(iOS 13.4, *)
-    public lazy var completion: ((Date?) -> Void)? = nil
-    
     @available(iOS, obsoleted: 13.4, message: "The `datePicker` will be used to display the date.")
     public lazy var label: UILabel = {
         let label = UILabel()
@@ -54,9 +54,25 @@ public class FilterDateCell: UICollectionViewCell {
 
         return label
     }()
+    
+    /// The callback after the user selects the date.
+    private lazy var _completion: ((Date?) -> Void)? = nil
 }
 
 public extension FilterDateCell {
+    var datePicker: UIDatePicker {
+        @available(iOS 13.4, *)
+        get { _datePicker }
+        set { _datePicker = newValue }
+    }
+    
+    /// The callback after the user selects the date.
+    var completion: ((Date?) -> Void)? {
+        @available(iOS 13.4, *)
+        get { _completion }
+        set { _completion = newValue }
+    }
+    
     @available(iOS 13.4, *)
     func setDate(_ _date: Date?) {
         guard let date = _date, datePicker.date != date else { return }

ColaCupTests/Info.plist

@@ -15,8 +15,8 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.0.3</string>
+	<string>3.0.4</string>
 	<key>CFBundleVersion</key>
-	<string>14</string>
+	<string>15</string>
 </dict>
 </plist>

ColaCupUITests/Info.plist

@@ -15,8 +15,8 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.0.3</string>
+	<string>3.0.4</string>
 	<key>CFBundleVersion</key>
-	<string>14</string>
+	<string>15</string>
 </dict>
 </plist>

Podfile

@@ -19,3 +19,14 @@ target 'ColaCup' do
 
 end
 
+post_install do |installer|
+  installer.pods_project.targets.each do |target|
+    target.build_configurations.each do |config|
+      
+      config.build_settings["CODE_SIGN_IDENTITY"] = ''
+      
+      config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '10.0'
+      
+    end
+  end
+end

Podfile.lock

@@ -15,6 +15,6 @@ SPEC CHECKSUMS:
   JSONPreview: 41c198dce3d1ecdb6345cba19804f65fc28bb9cf
   RaLog: 0d795de14557834577e64979ca2b7c7915937c67
 
-PODFILE CHECKSUM: 3131c9934d5b1c41216fcf4c7d7ae65408c25cce
+PODFILE CHECKSUM: 914f974b0d958bf0a8b0b8c5f08993521469b222
 
-COCOAPODS: 1.9.3
+COCOAPODS: 1.11.3

push.sh

@@ -35,7 +35,7 @@ release(){
 
     git_message="[Release] version: $version build: $build"
 
-    git add . && git commit -m $git_message
+    git add . && git commit -m "$git_message"
 
     git checkout master
     git merge --no-ff -m 'Merge branch '$release_branch'' $release_branch