Merge pull request #7 from grab/master

Merge from grab/master
kientux · Jan 26, 2021 · fa20b30 · fa20b30
2 parents 68e4ec5 + 76f7468
commit fa20b30
Show file tree

Hide file tree

Showing 12 changed files with 185 additions and 189 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,13 @@
 # Changelog
 
-## master (to be 0.1.12)
+## master (to be 0.1.13)
+### Enhancements
+NA
+
+### Bug fixes
+NA
+
+## 0.1.12
 ### Enhancements
 - Speed up cache unzip by running them in parallel.
 - Remove the `still_download_sources` option. Instead, always download sources to avoid improper integration.

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cocoapods-binary-cache (0.1.11)
+    cocoapods-binary-cache (0.1.12)
       cocoapods (>= 1.5.0)
       fourflusher (~> 2.0)
       parallel (~> 1.0)
@@ -99,6 +99,7 @@ GEM
     ffi (1.13.1)
     fourflusher (2.3.1)
     fuzzy_match (2.0.4)
+    generator (0.0.1)
     gh_inspector (1.1.3)
     git (1.7.0)
       rchardet (~> 1.8)
@@ -145,9 +146,9 @@ GEM
     rake (10.5.0)
     rchardet (1.8.0)
     rexml (3.2.4)
-    rgl (0.5.6)
+    rgl (0.5.7)
       lazy_priority_queue (~> 0.1.0)
-      stream (~> 0.5.2)
+      stream (~> 0.5.3)
     rouge (2.0.7)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
@@ -177,7 +178,8 @@ GEM
     sawyer (0.8.2)
       addressable (>= 2.3.5)
       faraday (> 0.8, < 2.0)
-    stream (0.5.2)
+    stream (0.5.3)
+      generator
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
     thread_safe (0.3.6)

diff --git a/PodBinaryCacheExample/Gemfile b/PodBinaryCacheExample/Gemfile
@@ -1,3 +1,3 @@
 source 'https://rubygems.org'
-gem 'cocoapods'
+gem 'cocoapods', '1.8.4'
 gem "cocoapods-binary-cache", :path => "../"
diff --git a/PodBinaryCacheExample/Gemfile.lock b/PodBinaryCacheExample/Gemfile.lock
@@ -1,37 +1,35 @@
 PATH
   remote: ..
   specs:
-    cocoapods-binary-cache (0.1.11)
+    cocoapods-binary-cache (0.1.3)
       cocoapods (>= 1.5.0)
       fourflusher (~> 2.0)
-      parallel (~> 1.0)
       rgl (~> 0.5.6)
       xcpretty (~> 0.3.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (3.0.3)
-    activesupport (5.2.4.4)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
+    CFPropertyList (3.0.2)
+    activesupport (4.2.11.1)
+      i18n (~> 0.7)
       minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    addressable (2.7.0)
-      public_suffix (>= 2.0.2, < 5.0)
-    algoliasearch (1.27.5)
+    algoliasearch (1.27.1)
       httpclient (~> 2.8, >= 2.8.3)
       json (>= 1.5.1)
     atomos (0.1.3)
     claide (1.0.3)
-    cocoapods (1.10.1)
-      addressable (~> 2.6)
+    cocoapods (1.8.4)
+      activesupport (>= 4.0.2, < 5)
       claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.10.1)
+      cocoapods-core (= 1.8.4)
       cocoapods-deintegrate (>= 1.0.3, < 2.0)
-      cocoapods-downloader (>= 1.4.0, < 2.0)
+      cocoapods-downloader (>= 1.2.2, < 2.0)
       cocoapods-plugins (>= 1.0.0, < 2.0)
       cocoapods-search (>= 1.0.0, < 2.0)
+      cocoapods-stats (>= 1.0.0, < 2.0)
       cocoapods-trunk (>= 1.4.0, < 2.0)
       cocoapods-try (>= 1.1.0, < 2.0)
       colored2 (~> 3.1)
@@ -41,74 +39,62 @@ GEM
       molinillo (~> 0.6.6)
       nap (~> 1.0)
       ruby-macho (~> 1.4)
-      xcodeproj (>= 1.19.0, < 2.0)
-    cocoapods-core (1.10.1)
-      activesupport (> 5.0, < 6)
-      addressable (~> 2.6)
+      xcodeproj (>= 1.11.1, < 2.0)
+    cocoapods-core (1.8.4)
+      activesupport (>= 4.0.2, < 6)
       algoliasearch (~> 1.0)
       concurrent-ruby (~> 1.1)
       fuzzy_match (~> 2.0.4)
       nap (~> 1.0)
-      netrc (~> 0.11)
-      public_suffix
-      typhoeus (~> 1.0)
     cocoapods-deintegrate (1.0.4)
-    cocoapods-downloader (1.4.0)
+    cocoapods-downloader (1.3.0)
     cocoapods-plugins (1.0.0)
       nap
     cocoapods-search (1.0.0)
+    cocoapods-stats (1.1.0)
     cocoapods-trunk (1.5.0)
       nap (>= 0.8, < 2.0)
       netrc (~> 0.11)
     cocoapods-try (1.2.0)
     colored2 (3.1.2)
-    concurrent-ruby (1.1.7)
+    concurrent-ruby (1.1.6)
     escape (0.0.4)
-    ethon (0.12.0)
-      ffi (>= 1.3.0)
-    ffi (1.14.2)
     fourflusher (2.3.1)
     fuzzy_match (2.0.4)
-    generator (0.0.1)
     gh_inspector (1.1.3)
     httpclient (2.8.3)
-    i18n (1.8.7)
+    i18n (0.9.5)
       concurrent-ruby (~> 1.0)
-    json (2.5.1)
+    json (2.3.0)
     lazy_priority_queue (0.1.1)
-    minitest (5.14.3)
+    minitest (5.14.0)
     molinillo (0.6.6)
-    nanaimo (0.3.0)
+    nanaimo (0.2.6)
     nap (1.1.0)
     netrc (0.11.0)
-    parallel (1.20.1)
-    public_suffix (4.0.6)
-    rgl (0.5.7)
+    rgl (0.5.6)
       lazy_priority_queue (~> 0.1.0)
-      stream (~> 0.5.3)
+      stream (~> 0.5.2)
     rouge (2.0.7)
     ruby-macho (1.4.0)
-    stream (0.5.3)
-      generator
+    stream (0.5.2)
     thread_safe (0.3.6)
-    typhoeus (1.4.0)
-      ethon (>= 0.9.0)
-    tzinfo (1.2.9)
+    tzinfo (1.2.7)
       thread_safe (~> 0.1)
-    xcodeproj (1.19.0)
+    xcodeproj (1.17.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
       colored2 (~> 3.1)
-      nanaimo (~> 0.3.0)
+      nanaimo (~> 0.2.6)
     xcpretty (0.3.0)
       rouge (~> 2.0.7)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  cocoapods
+  cocoapods (= 1.8.4)
   cocoapods-binary-cache!
 
 BUNDLED WITH

diff --git a/PodBinaryCacheExample/PodBinCacheExample.xcodeproj/project.pbxproj b/PodBinaryCacheExample/PodBinCacheExample.xcodeproj/project.pbxproj
@@ -100,7 +100,7 @@
 				50F7EEB623A245B100876839 /* Sources */,
 				50F7EEB723A245B100876839 /* Frameworks */,
 				50F7EEB823A245B100876839 /* Resources */,
-				63DCFB7F4ABC9070B87E091B /* [CP] Embed Pods Frameworks */,
+				C84527E3D10B09EC3D6FB02D /* [CP] Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -180,7 +180,7 @@
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
-		63DCFB7F4ABC9070B87E091B /* [CP] Embed Pods Frameworks */ = {
+		C84527E3D10B09EC3D6FB02D /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (

diff --git a/PodBinaryCacheExample/PodBinCacheExample.xcworkspace/contents.xcworkspacedata b/PodBinaryCacheExample/PodBinCacheExample.xcworkspace/contents.xcworkspacedata
diff --git a/PodBinaryCacheExample/Podfile b/PodBinaryCacheExample/Podfile
@@ -9,20 +9,12 @@ if is_pod_binary_cache_enabled
   config_cocoapods_binary_cache(
     cache_repo: {
       "default" => {
-        # "remote" => "https://github.com/bigbangvn/demo-pod-binary-cache-prebuilt-libs.git",
-        "local" => ".cocoapods-binary-cache/PodBinaryCacheExample-libs"
+        "remote" => "https://github.com/bigbangvn/demo-pod-binary-cache-prebuilt-libs.git",
+        "local" => "~/.cocoapods-binary-cache/PodBinaryCacheExample-libs"
       }
     },
     prebuild_config: "Debug",
-    device_build_enabled: true,
-    xcframework: true,
-    bitcode_enabled: true,
-    disable_dsym: false,
-    build_args: {
-      :simulator => [
-        "ARCHS='x86_64 i386 arm64'"
-    ]
-  }
+    dev_pods_enabled: true
   )
   # set_unbuilt_dev_pods(['ConfigSDK']) // To test ABI breaking (crash, call wrong function) when there're code change in ConfigSDK and don't rebuild it's clients (ConfigService)
 end
@@ -62,10 +54,10 @@ target 'PodBinCacheExample' do
   pod 'ConfigSDK', :path => 'DevPods/ConfigSDK', :binary => true
 end
 
-# post_install do |installer|
-#   installer.pods_project.targets.each do |target|
-#     target.build_configurations.each do |config|
-#       config.build_settings['BUILD_LIBRARY_FOR_DISTRIBUTION'] = 'YES' # Only work from Xcode 11
-#     end
-#   end
-# end
+post_install do |installer|
+  installer.pods_project.targets.each do |target|
+    target.build_configurations.each do |config|
+      config.build_settings['BUILD_LIBRARY_FOR_DISTRIBUTION'] = 'YES' # Only work from Xcode 11
+    end
+  end
+end
diff --git a/PodBinaryCacheExample/Podfile.lock b/PodBinaryCacheExample/Podfile.lock
@@ -1,22 +1,117 @@
 PODS:
+  - AFNetworking (3.2.1):
+    - AFNetworking/NSURLSession (= 3.2.1)
+    - AFNetworking/Reachability (= 3.2.1)
+    - AFNetworking/Security (= 3.2.1)
+    - AFNetworking/Serialization (= 3.2.1)
+    - AFNetworking/UIKit (= 3.2.1)
+  - AFNetworking/NSURLSession (3.2.1):
+    - AFNetworking/Reachability
+    - AFNetworking/Security
+    - AFNetworking/Serialization
+  - AFNetworking/Reachability (3.2.1)
+  - AFNetworking/Security (3.2.1)
+  - AFNetworking/Serialization (3.2.1)
+  - AFNetworking/UIKit (3.2.1):
+    - AFNetworking/NSURLSession
+  - Alamofire (4.9.1)
   - CocoaLumberjack (3.6.0):
     - CocoaLumberjack/Core (= 3.6.0)
   - CocoaLumberjack/Core (3.6.0)
+  - ConfigSDK (0.0.1):
+    - ProtocolBuffers-Swift
+    - SQLite.swift
+  - ConfigService (0.0.1):
+    - ConfigSDK
+    - RxSwift
+  - Kingfisher (5.11.0):
+    - Kingfisher/Core (= 5.11.0)
+  - Kingfisher/Core (5.11.0)
+  - Masonry (1.1.0)
+  - MBProgressHUD (1.1.0)
+  - MJRefresh (3.3.1)
+  - ProtocolBuffers-Swift (4.0.6)
+  - Realm (4.1.1):
+    - Realm/Headers (= 4.1.1)
+  - Realm/Headers (4.1.1)
+  - RxSwift (5.1.1)
+  - SDWebImage (5.4.0):
+    - SDWebImage/Core (= 5.4.0)
+  - SDWebImage/Core (5.4.0)
   - SnapKit (5.0.1)
+  - SQLite.swift (0.12.2):
+    - SQLite.swift/standard (= 0.12.2)
+  - SQLite.swift/standard (0.12.2)
+  - SVProgressHUD (2.2.5)
+  - SwiftyJSON (5.0.0)
 
 DEPENDENCIES:
+  - AFNetworking (= 3.2.1)
+  - Alamofire
   - CocoaLumberjack
+  - ConfigSDK (from `DevPods/ConfigSDK`)
+  - ConfigService (from `DevPods/ConfigService`)
+  - Kingfisher
+  - Masonry
+  - MBProgressHUD
+  - MJRefresh
+  - Realm
+  - RxSwift (from `https://github.com/ReactiveX/RxSwift.git`, commit `a580d07ed002217fd91d8446c3a852486e9beefa`)
+  - SDWebImage
   - SnapKit
+  - SVProgressHUD
+  - SwiftyJSON
 
 SPEC REPOS:
-  trunk:
+  https://github.com/CocoaPods/Specs.git:
+    - AFNetworking
+    - Alamofire
     - CocoaLumberjack
+    - Kingfisher
+    - Masonry
+    - MBProgressHUD
+    - MJRefresh
+    - ProtocolBuffers-Swift
+    - Realm
+    - SDWebImage
     - SnapKit
+    - SQLite.swift
+    - SVProgressHUD
+    - SwiftyJSON
+
+EXTERNAL SOURCES:
+  ConfigSDK:
+    :path: DevPods/ConfigSDK
+  ConfigService:
+    :path: DevPods/ConfigService
+  RxSwift:
+    :commit: a580d07ed002217fd91d8446c3a852486e9beefa
+    :git: https://github.com/ReactiveX/RxSwift.git
+
+CHECKOUT OPTIONS:
+  RxSwift:
+    :commit: a580d07ed002217fd91d8446c3a852486e9beefa
+    :git: https://github.com/ReactiveX/RxSwift.git
 
 SPEC CHECKSUMS:
+  AFNetworking: b6f891fdfaed196b46c7a83cf209e09697b94057
+  Alamofire: 85e8a02c69d6020a0d734f6054870d7ecb75cf18
   CocoaLumberjack: 78b0c238666f4f58db069738ec176f4519557516
+  ConfigSDK: adac49ecc5094210b806c74c3fb1b1e8cb0c289f
+  ConfigService: cae3fbae5b4bda148f481de790c4da1823443178
+  Kingfisher: 4569606189149e19c7d9439f47e885d0679b7a90
+  Masonry: 678fab65091a9290e40e2832a55e7ab731aad201
+  MBProgressHUD: e7baa36a220447d8aeb12769bf0585582f3866d9
+  MJRefresh: eeda70fbf0ad277f3178cef1cd0c3532591d6237
+  ProtocolBuffers-Swift: 09b5cfcc641ab512d6aaa1d2cc3879a40432052c
+  Realm: 25f0a8244cbb1c2271c922963ea8666fc2d8104d
+  RxSwift: 81470a2074fa8780320ea5fe4102807cb7118178
+  SDWebImage: 5bf6aec6481ae2a062bdc59f9d6c1d1e552090e0
   SnapKit: 97b92857e3df3a0c71833cce143274bf6ef8e5eb
+  SQLite.swift: d2b4642190917051ce6bd1d49aab565fe794eea3
+  SVProgressHUD: 1428aafac632c1f86f62aa4243ec12008d7a51d6
+  SwiftyJSON: 36413e04c44ee145039d332b4f4e2d3e8d6c4db7
 
-PODFILE CHECKSUM: e310d5307d1ca405fc61e34e60bb708c335f8935
+PODFILE CHECKSUM: 1cb7b7ae66561363f746423ff953196a642277a6
 
-COCOAPODS: 1.10.1
+COCOAPODS: 1.8.4
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.1.11
+0.1.12