Merge pull request #713 from tiennou/build-it

tiennou · web-flow · commit c5ff513bee3c · 2021-05-07T23:39:40.000+02:00
Build it
diff --git a/.gitignore b/.gitignore
@@ -2,33 +2,17 @@
 *.swp
 *~.nib
 
-build/*
-.build/*
-build-iPhoneSimulator/*
-build-iPhoneOS/*
-objective-git.bridgesupport
-ObjectiveGitFramework/build/*
-ObjectiveGit-iOS.framework/*
-External/libgit2*.a
-External/libgit2-ios
-
 *.pbxuser
 *.perspective
 *.perspectivev3
 
 *.mode1v3
 *.mode2v3
 
-project.xcworkspace
 */xcuserdata/
 *.xccheckout
 *.xcscmblueprint
 
-ObjectiveGitTests/fixtures/Fixtures/*
-
-External/ios-openssl/include
-External/ios-openssl/lib
-External/libssh2-ios
-
+External/libgit2-mac.a
 Carthage/Build
 
diff --git a/.travis.yml b/.travis.yml
@@ -7,17 +7,15 @@
 #
 ---
 os: osx
-osx_image: xcode9.3
+osx_image: xcode12.2
 language: objective-c
 
 matrix:
   fast_finish: true
   include:
-    - osx_image: xcode9.3
-      env:
+    - env:
         - SCHEME="ObjectiveGit Mac"
-    - osx_image: xcode9.3
-      env:
+    - env:
         - SCHEME="ObjectiveGit iOS"
 
 before_install:
diff --git a/Cartfile.private b/Cartfile.private
@@ -1,4 +1,4 @@
 github "jspahrsummers/xcconfigs" "master"
-github "Quick/Quick" ~> 1.3.4
-github "Quick/Nimble" ~> 7.3.3
-github "ZipArchive/ZipArchive" ~> 2.1.4
+github "Quick/Quick" ~> 2.1.0
+github "Quick/Nimble" ~> 8.0.1
+github "ZipArchive/ZipArchive" ~> 2.2.3
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,4 +1,4 @@
-github "Quick/Nimble" "v7.3.3"
-github "Quick/Quick" "v1.3.4"
-github "ZipArchive/ZipArchive" "v2.1.4"
-github "jspahrsummers/xcconfigs" "bb795558a76e5daf3688500055bbcfe243bffa8d"
+github "Quick/Nimble" "v8.1.2"
+github "Quick/Quick" "v2.2.1"
+github "ZipArchive/ZipArchive" "v2.2.3"
+github "jspahrsummers/xcconfigs" "4ced0ad5a971220917994a4edfa6abf9702e3818"
diff --git a/Carthage/Checkouts/Nimble b/Carthage/Checkouts/Nimble
@@ -1 +1 @@
-Subproject commit 9a281b1cfa1c53d1e8bd92e1798e4e473af8d263
+Subproject commit 7a46a5fc86cb917f69e3daf79fcb045283d8f008
diff --git a/Carthage/Checkouts/Quick b/Carthage/Checkouts/Quick
@@ -1 +1 @@
-Subproject commit f2b5a06440ea87eba1a167cab37bf6496646c52e
+Subproject commit 09b3becb37cb2163919a3842a4c5fa6ec7130792
diff --git a/Carthage/Checkouts/ZipArchive b/Carthage/Checkouts/ZipArchive
@@ -1 +1 @@
-Subproject commit e8b08ceb6ab9ff56e0826913b13680a129a92828
+Subproject commit f3379e6efa93e657293573ad196302b94041e464
diff --git a/Carthage/Checkouts/xcconfigs b/Carthage/Checkouts/xcconfigs
@@ -1 +1 @@
-Subproject commit bb795558a76e5daf3688500055bbcfe243bffa8d
+Subproject commit 4ced0ad5a971220917994a4edfa6abf9702e3818
diff --git a/ObjectiveGitFramework.xcodeproj/project.pbxproj b/ObjectiveGitFramework.xcodeproj/project.pbxproj
diff --git a/ObjectiveGitFramework.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/ObjectiveGitFramework.xcodeproj/project.xcworkspace/contents.xcworkspacedata
diff --git a/ObjectiveGitFramework.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/ObjectiveGitFramework.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/ObjectiveGitFramework.xcodeproj/xcshareddata/xcschemes/ObjectiveGit Mac.xcscheme b/ObjectiveGitFramework.xcodeproj/xcshareddata/xcschemes/ObjectiveGit Mac.xcscheme
@@ -83,6 +83,15 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "8DC2EF4F0486A6940098B216"
+            BuildableName = "ObjectiveGit.framework"
+            BlueprintName = "ObjectiveGit-Mac"
+            ReferencedContainer = "container:ObjectiveGitFramework.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -95,17 +104,6 @@
             </BuildableReference>
          </TestableReference>
       </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "8DC2EF4F0486A6940098B216"
-            BuildableName = "ObjectiveGit.framework"
-            BlueprintName = "ObjectiveGit-Mac"
-            ReferencedContainer = "container:ObjectiveGitFramework.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -127,8 +125,6 @@
             ReferencedContainer = "container:ObjectiveGitFramework.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Profile"
diff --git a/ObjectiveGitFramework.xcodeproj/xcshareddata/xcschemes/ObjectiveGit iOS.xcscheme b/ObjectiveGitFramework.xcodeproj/xcshareddata/xcschemes/ObjectiveGit iOS.xcscheme
@@ -69,6 +69,15 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "D01B6ED219F82E2000D411BC"
+            BuildableName = "ObjectiveGit.framework"
+            BlueprintName = "ObjectiveGit-iOS"
+            ReferencedContainer = "container:ObjectiveGitFramework.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -81,17 +90,6 @@
             </BuildableReference>
          </TestableReference>
       </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "D01B6ED219F82E2000D411BC"
-            BuildableName = "ObjectiveGit.framework"
-            BlueprintName = "ObjectiveGit-iOS"
-            ReferencedContainer = "container:ObjectiveGitFramework.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -112,8 +110,6 @@
             ReferencedContainer = "container:ObjectiveGitFramework.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Profile"
diff --git a/ObjectiveGitFramework.xcworkspace/contents.xcworkspacedata b/ObjectiveGitFramework.xcworkspace/contents.xcworkspacedata
diff --git a/ObjectiveGitFramework.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/ObjectiveGitFramework.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict/>
+</plist>
diff --git a/script/cibuild b/script/cibuild
@@ -59,7 +59,7 @@ if [ "$SCHEME" == "ObjectiveGit Mac" ]; then
     -scheme "$SCHEME" \
     ${XCODE_OPTIONS[*]} \
     build test \
-    2>&1 | xcpretty $XCPRETTY_FORMAT_OPTIONS
+    2>&1 #| xcpretty $XCPRETTY_FORMAT_OPTIONS
 elif [ "$SCHEME" == "ObjectiveGit iOS" ]; then
   echo "*** Prebuilding OpenSSL"
   "$SCRIPT_DIR/update_libssl_ios"
@@ -69,9 +69,9 @@ elif [ "$SCHEME" == "ObjectiveGit iOS" ]; then
 
   xcodebuild -workspace "$XCWORKSPACE" \
     -scheme "$SCHEME" \
-    -destination "platform=iOS Simulator,name=iPhone 5" \
+    -destination "platform=iOS Simulator,name=iPhone 11" \
     -sdk iphonesimulator \
     ${XCODE_OPTIONS[*]} \
     build test \
-    2>&1 | xcpretty $XCPRETTY_FORMAT_OPTIONS
+    2>&1 #| xcpretty $XCPRETTY_FORMAT_OPTIONS
 fi
diff --git a/script/update_libgit2 b/script/update_libgit2
@@ -7,7 +7,7 @@ set -e
 # ~/.MacOSX/environment.plist
 PATH="/usr/local/bin:$PATH"
 
-if [ "External/libgit2.a" -nt "External/libgit2" ]
+if [ "External/libgit2-mac.a" -nt "External/libgit2" ]
 then
     echo "No update needed."
     exit 0
@@ -33,9 +33,9 @@ cmake -DBUILD_SHARED_LIBS:BOOL=OFF \
 cmake --build .
 
 product="libgit2.a"
-install_path="../../${product}"
-if [ "${product}" -nt "${install_path}" ]; then
-    cp -v "${product}" "${install_path}"
+install_path="../../"
+if [ "libgit2.a" -nt "${install_path}/libgit2-mac.a" ]; then
+    cp -v "libgit2.a" "${install_path}/libgit2-mac.a"
 fi
 
 echo "libgit2 has been updated."
