Merge branch 'deploy/1.4.2' into productive

FlineDev · Mar 22, 2016 · 187d762 · 187d762
2 parents e837f69 + 85873a7
commit 187d762
Show file tree

Hide file tree

Showing 21 changed files with 836 additions and 275 deletions.
diff --git a/BartyCrouch.xcodeproj/project.pbxproj b/BartyCrouch.xcodeproj/project.pbxproj
@@ -13,6 +13,7 @@
 		821DED3A1C70CFBB00B8353B /* StringsFilesSearch.swift in Sources */ = {isa = PBXBuildFile; fileRef = 821DED391C70CFBB00B8353B /* StringsFilesSearch.swift */; };
 		821DED3C1C70D04B00B8353B /* StringsFilesSearchTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 821DED3B1C70D04B00B8353B /* StringsFilesSearchTests.swift */; };
 		825550FC1C7E637700DB5DCF /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 825550FE1C7E637700DB5DCF /* Localizable.strings */; };
+		8278A9001CA129C30041B196 /* Constants.m in Sources */ = {isa = PBXBuildFile; fileRef = 8278A8FF1CA129960041B196 /* Constants.m */; };
 		828ED5351C710C2B00E0E947 /* StringsFileUpdater.swift in Sources */ = {isa = PBXBuildFile; fileRef = 82CDE2DF1C6BF35500055FE6 /* StringsFileUpdater.swift */; };
 		828ED5361C710C2F00E0E947 /* IBToolCommander.swift in Sources */ = {isa = PBXBuildFile; fileRef = 82CDE2EA1C6BF9D900055FE6 /* IBToolCommander.swift */; };
 		828ED5371C710C3100E0E947 /* StringsFilesSearch.swift in Sources */ = {isa = PBXBuildFile; fileRef = 821DED391C70CFBB00B8353B /* StringsFilesSearch.swift */; };
@@ -81,6 +82,8 @@
 		825551021C7E63AF00DB5DCF /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/Example.strings"; sourceTree = "<group>"; };
 		825551031C7E63B000DB5DCF /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/Example.strings"; sourceTree = "<group>"; };
 		825551041C7E63B000DB5DCF /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/Localizable.strings"; sourceTree = "<group>"; };
+		8278A8FF1CA129960041B196 /* Constants.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Constants.m; sourceTree = "<group>"; };
+		8278A9011CA129FA0041B196 /* Constants.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Constants.h; sourceTree = "<group>"; };
 		82CDE2641C6ABBF500055FE6 /* BartyCrouch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BartyCrouch.h; sourceTree = "<group>"; };
 		82CDE2651C6ABBF500055FE6 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		82CDE26E1C6ABD8800055FE6 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -219,6 +222,8 @@
 			children = (
 				82CDE26E1C6ABD8800055FE6 /* Info.plist */,
 				82CDE2F71C6C08F800055FE6 /* BartyCrouchTests-Bridging-Header.h */,
+				8278A9011CA129FA0041B196 /* Constants.h */,
+				8278A8FF1CA129960041B196 /* Constants.m */,
 			);
 			path = "Supporting Files";
 			sourceTree = "<group>";
@@ -462,6 +467,7 @@
 				82CDE2ED1C6BFE8F00055FE6 /* IBToolCommanderTests.swift in Sources */,
 				821DED3C1C70D04B00B8353B /* StringsFilesSearchTests.swift in Sources */,
 				82CDE2EF1C6BFE9D00055FE6 /* StringsFileUpdaterTests.swift in Sources */,
+				8278A9001CA129C30041B196 /* Constants.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -689,7 +695,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "-";
 				COMBINE_HIDPI_IMAGES = YES;
-				GCC_PREPROCESSOR_DEFINITIONS = "PROJECT_DIR=@\\\"${PROJECT_DIR}\\\"";
+				GCC_PREPROCESSOR_DEFINITIONS = "PROJECT_DIR=@\\\"$PROJECT_DIR\\\"";
 				INFOPLIST_FILE = "Tests/Supporting Files/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.11;
@@ -707,7 +713,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "-";
 				COMBINE_HIDPI_IMAGES = YES;
-				GCC_PREPROCESSOR_DEFINITIONS = "PROJECT_DIR=@\\\"${PROJECT_DIR}\\\"";
+				GCC_PREPROCESSOR_DEFINITIONS = "PROJECT_DIR=@\\\"$PROJECT_DIR\\\"";
 				INFOPLIST_FILE = "Tests/Supporting Files/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.11;

diff --git a/Cartfile b/Cartfile
@@ -1,5 +1,5 @@
 # A pure Swift library for creating command-line interfaces
-github "jatoben/CommandLine"
+github "jatoben/CommandLine" "master"
 
 # A simple Swift API for Microsoft Translator
 github "Dschee/Polyglot" "master"
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,2 +1,2 @@
-github "jatoben/CommandLine" "v2.0.0"
+github "jatoben/CommandLine" "43fc514e0341f2b4dbb4ff0538381d35bf9ca9a4"
 github "Dschee/Polyglot" "1f5f008c0fa44f37567de170c8f85c22f03612d0"
diff --git a/Carthage/Checkouts/CommandLine/.gitignore b/Carthage/Checkouts/CommandLine/.gitignore
@@ -1,6 +1,7 @@
 # Xcode
 #
 build/
+.build/
 *.pbxuser
 !default.pbxuser
 *.mode1v3

diff --git a/Carthage/Checkouts/CommandLine/.travis.yml b/Carthage/Checkouts/CommandLine/.travis.yml
@@ -1,5 +1,18 @@
-language: objective-c # this is a lie
-xcode_project: CommandLine.xcodeproj
-xcode_scheme: CommandLine
-script: xcodebuild -scheme CommandLine test
-osx_image: xcode7
+matrix:
+  include:
+    - os: osx
+      language: objective-c # this is a lie
+      xcode_project: CommandLine.xcodeproj
+      xcode_scheme: CommandLine
+      script: xcodebuild -scheme CommandLine test
+      osx_image: xcode7.2
+    - os: linux
+      sudo: required
+      dist: trusty
+      before_install:
+        - sudo apt-get install -y libicu-dev
+        - ./install-linux-swift.sh
+        - export PATH="/swift/usr/bin:${PATH}"
+      script:
+        - swift build -v
+        - .build/debug/CommandLineTests