From fe1607fa7fa6a389ce5b1aa57307ff72ff0d9ad0 Mon Sep 17 00:00:00 2001 From: Ryo Aoyama Date: Wed, 3 Apr 2019 15:55:14 +0900 Subject: [PATCH 1/6] Fix package config --- Package.swift | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/Package.swift b/Package.swift index 3a45bdc..a9f812d 100644 --- a/Package.swift +++ b/Package.swift @@ -5,19 +5,24 @@ import PackageDescription let package = Package( name: "AcknowledgementsPlist", + products: [ + .executable(name: "acknowledgementsplist", targets: ["acknowledgementsplist"]) + ], dependencies: [ - .package(url: "https://github.com/kylef/Commander.git", - from: "0.8.0") + .package(url: "https://github.com/kylef/Commander.git", from: "0.8.0") ], targets: [ .target( - name: "AcknowledgementsPlist", - dependencies: ["Commander", "AcknowledgementsPlistCore"]), + name: "acknowledgementsplist", + dependencies: ["Commander", "AcknowledgementsPlistCore"] + ), .target( name: "AcknowledgementsPlistCore", - dependencies: []), + dependencies: [] + ), .testTarget( name: "AcknowledgementsPlistTests", - dependencies: ["AcknowledgementsPlist"]), + dependencies: ["acknowledgementsplist"] + ), ] ) From 8eb7f2a22e902bb1cd027ddd1ab5bed6b06509ae Mon Sep 17 00:00:00 2001 From: Ryo Aoyama Date: Wed, 3 Apr 2019 16:15:14 +0900 Subject: [PATCH 2/6] Add makefile for build portable zip --- Makefile | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 Makefile diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..50c988c --- /dev/null +++ b/Makefile @@ -0,0 +1,13 @@ +TEMP_ZIP_DIR=./tmp/portable_zip +SWIFT_BIN_DIR=$(shell swift build -c release --show-bin-path) +BIN_NAME=acknowledgementsplist + +.PHONY: portable_zip + +portable_zip: + swift build -c release --static-swift-stdlib + mkdir -p $(TEMP_ZIP_DIR) + cp -f $(SWIFT_BIN_DIR)/$(BIN_NAME) $(TEMP_ZIP_DIR) + cp -f LICENSE $(TEMP_ZIP_DIR) + (cd $(TEMP_ZIP_DIR); zip -yr - $(BIN_NAME) LICENSE) > ./portable_swiftlint.zip + rm -rf $(TEMP_ZIP_DIR) \ No newline at end of file From 273e21bd8430f943f8ef96a96d571a37b67f52fd Mon Sep 17 00:00:00 2001 From: Ryo Aoyama Date: Wed, 3 Apr 2019 16:17:11 +0900 Subject: [PATCH 3/6] Add make project --- Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Makefile b/Makefile index 50c988c..c64f445 100644 --- a/Makefile +++ b/Makefile @@ -4,6 +4,9 @@ BIN_NAME=acknowledgementsplist .PHONY: portable_zip +project: + swift package generate-xcodeproj + portable_zip: swift build -c release --static-swift-stdlib mkdir -p $(TEMP_ZIP_DIR) From f4cb45768259801cefa44fcf65b3a2ffa20f4ef1 Mon Sep 17 00:00:00 2001 From: Ryo Aoyama Date: Wed, 3 Apr 2019 18:50:03 +0900 Subject: [PATCH 4/6] Update Makefile --- .swift_version | 1 + Makefile | 8 +++++--- Package.swift | 3 +-- 3 files changed, 7 insertions(+), 5 deletions(-) create mode 100644 .swift_version diff --git a/.swift_version b/.swift_version new file mode 100644 index 0000000..819e07a --- /dev/null +++ b/.swift_version @@ -0,0 +1 @@ +5.0 diff --git a/Makefile b/Makefile index c64f445..8f1e87a 100644 --- a/Makefile +++ b/Makefile @@ -2,13 +2,15 @@ TEMP_ZIP_DIR=./tmp/portable_zip SWIFT_BIN_DIR=$(shell swift build -c release --show-bin-path) BIN_NAME=acknowledgementsplist -.PHONY: portable_zip +.PHONY: project release_build portable_zip project: swift package generate-xcodeproj -portable_zip: - swift build -c release --static-swift-stdlib +release_build: + swift build -c release + +portable_zip: release_build mkdir -p $(TEMP_ZIP_DIR) cp -f $(SWIFT_BIN_DIR)/$(BIN_NAME) $(TEMP_ZIP_DIR) cp -f LICENSE $(TEMP_ZIP_DIR) diff --git a/Package.swift b/Package.swift index a9f812d..9360392 100644 --- a/Package.swift +++ b/Package.swift @@ -1,5 +1,4 @@ -// swift-tools-version:4.2 -// The swift-tools-version declares the minimum version of Swift required to build this package. +// swift-tools-version:5.0 import PackageDescription From 526215aec10809dcb990d41e256f93a7c160008c Mon Sep 17 00:00:00 2001 From: Ryo Aoyama Date: Wed, 3 Apr 2019 19:29:25 +0900 Subject: [PATCH 5/6] Fix tests --- .travis.yml | 2 +- README.md | 12 ++++++------ Sample/Scripts/make-acknowledgements-plist.sh | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 85921f5..245f2e3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: generic os: osx -osx_image: xcode10 +osx_image: xcode10.2 before_install: - gem install xcpretty script: diff --git a/README.md b/README.md index 791d281..bfc0eb7 100644 --- a/README.md +++ b/README.md @@ -18,8 +18,8 @@ I implement it so that it will be completed locally! ## Requirements -- Xcode 10 -- Swift 4.2 +- Xcode 10.2+ +- Swift 5+ ## How to install #### CocoaPods @@ -37,9 +37,9 @@ I think that you can execute it after `Pods` or `Carthage` is updated. ### Usage ``` -./AcknowledgementsPlist [PROJECT_ROOT_PATH] [OUTPUT_PATH] [OPTIONS] +acknowledgementsplist [PROJECT_ROOT_PATH] [OUTPUT_PATH] [OPTIONS] -e.g. ./AcknowledgementsPlist . ./Sample-Acknowledgements.plist --manual-plist-path ./ManualAcknowledgements.plist +e.g. acknowledgementsplist . ./Sample-Acknowledgements.plist --manual-plist-path ./ManualAcknowledgements.plist ``` #### `[PROJECT_ROOT_PATH]` @@ -93,7 +93,7 @@ e.g. ./AcknowledgementsPlist . ./Sample-Acknowledgements.plist --manual-plist-pa If `Carthage/Checkouts` does not exist, execute the command of `carthage checkout`. 2. Determine the location of the `AcknowledgementsPlist` and the output location of `Plist`. -e.g. `./AcknowledgementsPlist . ./Sample/Resources/Sample-Acknowledgements.plist` +e.g. `acknowledgementsplist . ./Sample/Resources/Sample-Acknowledgements.plist` ### Make Bundle 1. Please do `1.` of Make Plist. @@ -122,7 +122,7 @@ e.g. `./AcknowledgementsPlist . ./Sample/Resources/Sample-Acknowledgements.plist ``` 3. Determine the location of the `AcknowledgementsPlist` and the output location of `Bundle`. -e.g. `./AcknowledgementsPlist . ./Sample/Resources/Settings.bundle` +e.g. `acknowledgementsplist . ./Sample/Resources/Settings.bundle` ## LICENSE Under the MIT license. See [LICENSE](https://github.com/cats-oss/AcknowledgementsPlist/blob/master/LICENSE) file for details. diff --git a/Sample/Scripts/make-acknowledgements-plist.sh b/Sample/Scripts/make-acknowledgements-plist.sh index 34fa8f6..dd461da 100755 --- a/Sample/Scripts/make-acknowledgements-plist.sh +++ b/Sample/Scripts/make-acknowledgements-plist.sh @@ -1,7 +1,7 @@ #!/bin/bash PROJECT_ROOT_PATH=./.. -ACK_PLIST_EXE=${PROJECT_ROOT_PATH}/Pods/AcknowledgementsPlist/AcknowledgementsPlist +ACK_PLIST_EXE=${PROJECT_ROOT_PATH}/Pods/AcknowledgementsPlist/acknowledgementsplist OUTPUT_PLIST_PATH=./Sample/Resources/Sample-Acknowledgements.plist OUTPUT_BUNDLE_PATH=./Sample/Resources/Settings.bundle MANUAL_ACK_PATH=./Sample/Resources/ManualAcknowledgements.plist From c6fd6be2d4479687ab79dd4a425f1b7cc5e6e8ef Mon Sep 17 00:00:00 2001 From: Ryo Aoyama Date: Wed, 3 Apr 2019 19:36:12 +0900 Subject: [PATCH 6/6] Update podspec --- AcknowledgementsPlist.podspec | 4 ++-- Makefile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/AcknowledgementsPlist.podspec b/AcknowledgementsPlist.podspec index aad1514..0604cf6 100644 --- a/AcknowledgementsPlist.podspec +++ b/AcknowledgementsPlist.podspec @@ -1,11 +1,11 @@ Pod::Spec.new do |s| s.name = 'AcknowledgementsPlist' - s.version = '0.0.3' + s.version = '0.0.4' s.summary = 'AcknowledgementsPlist manages the licenses of libraries that depend on your iOS app.' s.homepage = 'https://github.com/cats-oss/AcknowledgementsPlist' s.license = { :type => 'MIT', :file => 'LICENSE' } s.author = { 'Takuma Horiuchi' => 'horitaku46@gmail.com' } - s.source = { http: "#{s.homepage}/releases/download/#{s.version}/AcknowledgementsPlist.zip" } + s.source = { http: "#{s.homepage}/releases/download/#{s.version}/portable_acknowledgementsplist.zip" } s.preserve_paths = '*' s.exclude_files = "**/file.zip" end diff --git a/Makefile b/Makefile index 8f1e87a..ab7a01f 100644 --- a/Makefile +++ b/Makefile @@ -14,5 +14,5 @@ portable_zip: release_build mkdir -p $(TEMP_ZIP_DIR) cp -f $(SWIFT_BIN_DIR)/$(BIN_NAME) $(TEMP_ZIP_DIR) cp -f LICENSE $(TEMP_ZIP_DIR) - (cd $(TEMP_ZIP_DIR); zip -yr - $(BIN_NAME) LICENSE) > ./portable_swiftlint.zip + (cd $(TEMP_ZIP_DIR); zip -yr - $(BIN_NAME) LICENSE) > ./portable_acknowledgementsplist.zip rm -rf $(TEMP_ZIP_DIR) \ No newline at end of file