Merge branch 'release/0.2.0'

bcylin · May 28, 2019 · d2dd05b · d2dd05b
2 parents 1e1c14f + d2eb651
commit d2dd05b
Show file tree

Hide file tree

Showing 10 changed files with 33 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Change Log
 
+## 0.2.0
+
+* Support the plist located in `Settings.bundle`.
+
 ## 0.1.0
 
 * Initial release

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cocoapods-acknowledgements-addons (0.1.0)
+    cocoapods-acknowledgements-addons (0.2.0)
       cocoapods (>= 0.36)
       cocoapods-acknowledgements
 

diff --git a/README.md b/README.md
@@ -43,7 +43,7 @@ The plugin searches `**/*.podspec` located in the specified directories and adds
     └── Pods-{target_name}-metadata.plist
 ```
 
-> This plugin does not support the format used in `Settings.bundle` at the moment.
+This plugin also updates the app's `Settings.bundle/Pods-{target_name}-settings-metadata.plist` if it exists.
 
 Check out the [example app](https://github.com/bcylin/cocoapods-acknowledgements-addons/tree/master/example) for the configuration to use with [CPDAcknowledgements](https://github.com/CocoaPods/CPDAcknowledgements).
 

diff --git a/example/App.xcodeproj/project.pbxproj b/example/App.xcodeproj/project.pbxproj
@@ -241,12 +241,14 @@
 			);
 			inputPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-App/Pods-App-frameworks.sh",
+				"${BUILT_PRODUCTS_DIR}/Alamofire/Alamofire.framework",
 				"${BUILT_PRODUCTS_DIR}/CPDAcknowledgements/CPDAcknowledgements.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputFileListPaths = (
 			);
 			outputPaths = (
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Alamofire.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CPDAcknowledgements.framework",
 			);
 			runOnlyForDeploymentPostprocessing = 0;

diff --git a/example/App/Info.plist b/example/App/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>0.2.0</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>LSRequiresIPhoneOS</key>

diff --git a/example/AppTests/Info.plist b/example/AppTests/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>0.2.0</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 </dict>

diff --git a/example/Podfile b/example/Podfile
@@ -2,6 +2,7 @@ platform :ios, "12.0"
 
 target :App do
   use_frameworks!
+  pod "Alamofire", git: "https://github.com/Alamofire/Alamofire.git", tag: "4.8.2"
   pod "CPDAcknowledgements", inhibit_warnings: true
 end
 

diff --git a/example/Podfile.lock b/example/Podfile.lock
@@ -1,16 +1,29 @@
 PODS:
+  - Alamofire (4.8.2)
   - CPDAcknowledgements (1.0.0)
 
 DEPENDENCIES:
+  - Alamofire (from `https://github.com/Alamofire/Alamofire.git`, tag `4.8.2`)
   - CPDAcknowledgements
 
 SPEC REPOS:
   https://github.com/cocoapods/specs.git:
     - CPDAcknowledgements
 
+EXTERNAL SOURCES:
+  Alamofire:
+    :git: https://github.com/Alamofire/Alamofire.git
+    :tag: 4.8.2
+
+CHECKOUT OPTIONS:
+  Alamofire:
+    :git: https://github.com/Alamofire/Alamofire.git
+    :tag: 4.8.2
+
 SPEC CHECKSUMS:
+  Alamofire: ae5c501addb7afdbb13687d7f2f722c78734c2d3
   CPDAcknowledgements: 6e15e71849ba4ad5e8a17a0bb9d20938ad23bac8
 
-PODFILE CHECKSUM: 60c8db414d14241f0675e337c67b7c1b73b89a73
+PODFILE CHECKSUM: f95597022bf609d22d7eb87aee64383751ce2c4c
 
 COCOAPODS: 1.6.1
diff --git a/example/README.md b/example/README.md
@@ -13,18 +13,23 @@ The plugin finds additional acknowledgements from the following directories:
 ```
 .
 ├── Acknowledgements
-│   └── Crypto (with podspec)
+│   └── Crypto
 ├── Carthage
 │   └── Checkouts
 │       ├── Alamofire
 │       ├── Crypto
-│       └── QuickTableViewController (ignored)
+│       └── QuickTableViewController
 ├── Dependencies
 │   └── Strongify
 ├── Podfile
 └── Podfile.lock
 ```
 
+* [`Crypto`](https://github.com/soffes/Crypto) is not available via CocoaPods. `Acknowledgements/Crypto/Crypto.podspec` provides the acknowledgement info.
+* `Alamofire` is ignored since it's already in Podfile.
+* `QuickTableViewController` is excluded from the list.
+* `Strongify` installed via git-submodule will be added to the acknowledgements.
+
 ### Launch the project
 
 ```sh

diff --git a/lib/version.rb b/lib/version.rb
@@ -1,5 +1,5 @@
 module CocoaPodsAcknowledgements
   module AddOns
-    VERSION = "0.1.0"
+    VERSION = "0.2.0"
   end
 end