Merge branch 'master' of https://github.com/keefertaylor/base58swift

keefertaylor · Nov 3, 2019 · 5535f7d · 5535f7d
2 parents 44bcd6c + 34396de
commit 5535f7d
Show file tree

Hide file tree

Showing 6 changed files with 995 additions and 9 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,11 +1,10 @@
- Created by http://www.gitignore.io
+# Created by http://www.gitignore.io
 
 ### SwiftPackageManager ###
 Packages
 .build/
 xcuserdata
 DerivedData/
-*.xcodeproj
 
 ### OSX ###
 .DS_Store

diff --git a/.travis.yml b/.travis.yml
@@ -12,21 +12,29 @@ before_install:
 
 jobs:
   include:
-    - stage: Build - Swift Package Manager
-      script:
-        - swift test
     - stage: Build - CocoaPods
+      install:
+        - brew outdated cocoapods || brew upgrade cocoapods      
       script:
-        - brew outdated cocoapods || brew upgrade cocoapods
         - pod lib lint
     - stage: Build - Carthage And Code Coverage
-      script:
-        - brew outdated carthage || brew upgrade carthage
+      install:
+        - brew outdated carthage || brew upgrade carthage      
         - brew install xcodegen
-        - gem install slather
+        - gem install slather        
+      script:
+        # Carthage requires that XCode project files are checked in. Project.yml is
+        # the canonical definition for the .xcodeproj file. Remove the .xcodeproj file
+        # and regenerate it. 
+        # See: https://github.com/Carthage/Carthage/issues/2684
+        - rm -rf Base58Swift.xcodeproj
         - xcodegen generate
+
+        # Build with Carthage
         - travis_wait 500 carthage bootstrap --platform iOS --no-use-binaries --verbose
         - set -o pipefail && xcodebuild test -scheme Base58Swift_iOS -destination 'platform=iOS Simulator,name=iPhone XS,OS=12.2' ONLY_ACTIVE_ARCH=YES | xcpretty
+
+        # Generate and Upload Code Coverage
         - slather
         - bash <(curl -s https://codecov.io/bash)
     - stage: Build and Push Release if tagged commit
@@ -42,7 +50,14 @@ jobs:
         - echo "Deploying Carthage"
         - brew outdated carthage || brew upgrade carthage
         - brew install xcodegen
+
+        # Carthage requires that XCode project files are checked in. Project.yml is
+        # the canonical definition for the .xcodeproj file. Remove the .xcodeproj file
+        # and regenerate it. 
+        # See: https://github.com/Carthage/Carthage/issues/2684
+        - rm -rf Base58Swift.xcodeproj
         - xcodegen generate
+
         - carthage build --no-skip-current --platform iOS,mac --cache-builds
         - carthage archive $FRAMEWORK_NAME
       deploy: