Merge branch 'release/1.0.3'

euskadi31 · Feb 12, 2016 · 48c62aa · 48c62aa
2 parents b3e7cd4 + 6af51a1
commit 48c62aa
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 19 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -18,7 +18,7 @@ before_script:
   - security import ./scripts/certs/dist.p12 -k ~/Library/Keychains/ios-build.keychain -P $KEY_PASSWORD -T /usr/bin/codesign
 script:
   - open -b com.apple.iphonesimulator # Workaround https://github.com/travis-ci/travis-ci/issues/3040
-  - xctool -project Glide.xcodeproj -scheme $SCHEME build test -destination='$DESTINATION' GCC_GENERATE_TEST_COVERAGE_FILES=YES GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES OBJROOT=$PWD/build SYMROOT=$PWD/build
+  - xctool -project Glide.xcodeproj -scheme $SCHEME build test -sdk $SDK -destination='$DESTINATION' GCC_GENERATE_TEST_COVERAGE_FILES=YES GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES OBJROOT=$PWD/build SYMROOT=$PWD/build
 after_success:
   - '[ "$CONFIGURATION" == "Debug" ] && slather coverage --coveralls --input-format profdata --scheme Glide Glide.xcodeproj'
 after_script:
@@ -30,14 +30,14 @@ cache:
     - vendor/bundle
 env:
   matrix:
-    - 'DESTINATION="platform=iOS Simulator,name=iPhone 5s,OS=9.0" CONFIGURATION="Release"       SCHEME="GlideIOS"'
-    - 'DESTINATION="platform=iOS Simulator,name=iPhone 5s,OS=9.2" CONFIGURATION="Release"       SCHEME="GlideIOS"'
-    - 'DESTINATION="platform=iOS Simulator,name=iPhone 6s,OS=9.2" CONFIGURATION="Release"       SCHEME="GlideIOS"'
-    - 'DESTINATION="platform=iOS Simulator,name=iPhone 4s"        CONFIGURATION="Release"       SCHEME="GlideIOS"'
-    - 'DESTINATION="platform=iOS Simulator,name=iPhone 5s"        CONFIGURATION="Release"       SCHEME="GlideIOS"'
-    - 'DESTINATION="platform=OS X"                                CONFIGURATION="Release"       SCHEME="Glide"'
-    - 'DESTINATION="platform=OS X"                                CONFIGURATION="Debug"         SCHEME="Glide"'
-    - 'DESTINATION="platform=tvOS Simulator,name=Apple TV 1080p"  CONFIGURATION="Release"       SCHEME="GlideTvOS"'
+    - 'DESTINATION="platform=iOS Simulator,name=iPhone 5s,OS=9.0" CONFIGURATION="Release"       SCHEME="GlideIOS"  SDK="iphonesimulator"'
+    - 'DESTINATION="platform=iOS Simulator,name=iPhone 5s,OS=9.2" CONFIGURATION="Release"       SCHEME="GlideIOS"  SDK="iphonesimulator"'
+    - 'DESTINATION="platform=iOS Simulator,name=iPhone 6s,OS=9.2" CONFIGURATION="Release"       SCHEME="GlideIOS"  SDK="iphonesimulator"'
+    - 'DESTINATION="platform=iOS Simulator,name=iPhone 4s"        CONFIGURATION="Release"       SCHEME="GlideIOS"  SDK="iphonesimulator"'
+    - 'DESTINATION="platform=iOS Simulator,name=iPhone 5s"        CONFIGURATION="Release"       SCHEME="GlideIOS"  SDK="iphonesimulator"'
+    - 'DESTINATION="platform=OS X"                                CONFIGURATION="Release"       SCHEME="Glide"     SDK="macosx10.11"'
+    - 'DESTINATION="platform=OS X"                                CONFIGURATION="Debug"         SCHEME="Glide"     SDK="macosx10.11"'
+    - 'DESTINATION="platform=tvOS Simulator,name=Apple TV 1080p"  CONFIGURATION="Release"       SCHEME="GlideTvOS" SDK="appletvsimulator"'
   global:
     - secure: aIjFYHUnBYysw7HAwqjIRT0Mu4vkYEqe4fbHiWDOCQih7UYjE+yq4WcMgWY6huComUUyNRNhH9a5rg5ww8llY6Zeyf/7l9SE7rKddK8adv3pGrc3Idpzb6w4ifxye+Jt0jWwqwZrA24JnB/xNhsd79430mMqlMgyGZTz+ArMz8W8B0KKqywUM/jsF/dlZLeD1jFX5Tn5Y/rSsDDhzs210WE9VXvqBYEFHaGlGTR17HPfGa05CWoivvTfGymAa5v+W2pPKlJBuL8UIRGwD83ILdBGXhHlolPLBSFV2W5GcBLpyZdFmOgoD/7nFCHdpoJXz9GL3XmTaKsMotvLMzRLmx/QriqyGrW7eu4g3p3hE/QsA3Wtgfz7gkbP2+B78HaArJ45lxaRn3foI30AkxV9d8nhuzocygmz8XWJH9cMk2/6LylhIm7yQxYad7vZHHzoIav9gI4Fwg17ONFsCAzCDl/QznqJofcGaA+G1MdecNMKvaYgSSwsaaRIq/FgNP+N9w0MDLTwq5sJQfv4dJH09tSbj+k4dRFTVF+w9q4erOx7M9VXQBMkjA5NZmkhujf+GJPzjx5Nefuenq5lCt2K3wZN8Da0lDAXQdBIjwWkFCZnFye8SoeSqnvL6wRvkyeXqkYk5yQ5u+NijkZ21XnsuEV5Kov/b2jWsJqw2bylCcw=
     - secure: n005EBUewdfHH5YK/Q8RsGzVS6Ybw8oMtypdkAi6sztRd28lSKUQz5K5EiFEKOX4immxhfw8XRHRPzLj69aXIunxWZ/cPPT/nYnUObCIi7YoN87KbLqh3IoCEMqD04Qn6kj2LBG6KlSax1MG6tcj9ZImfUCdRDq4Aoy1lDq/GBF26Y1ilhirdOYxAI7XORolwig7QWqiKdqVqq5PyaEtC8AHo2OM3uyfFqosr0FcXyjKtDQDX+X6reScehJ8eK15ztwL3a8WmUELodbRKxbDZcpONMS7GEzGWWOCiM8e8TfSvZX8XlPlo2TnkT/Du9s3EoJNvzN3b8z81iqQYGgoYHWsJPJjjbXLFCpb5X9h3G1H3lumNr975lNJNSBS2sTVteFfZkzg+iYOhuhOhr/f7/Xjh6gKk9JJzMw9ZVqf8GygV5w9NCbJK5hkTlM5SSKjkt2vEfZM4zdojwGZW5vVHz9JW8vuU089BJHxTjp8yzEsG2oyDixmbno55+uBkdVlDhb8sB6Ig/G4DzMvt8ZAbqyKIr37lOVZz6Ppd1hcjTt63s1UcHzLANK/2HBRFGh6UtHT5DlE5s1iJoMX3WzFXwtqAsbnh8vYLANrbFSS9J4Sdf+m66by3wX8jU86PPL3ga6bFAbjb/oZtSj4vll/KMg4wLLWTV0MsToQgaVa0Ko=
diff --git a/Glide.podspec b/Glide.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
     s.name         = 'Glide'
-    s.version      = '1.0.2'
+    s.version      = '1.0.3'
     s.summary      = 'Glide client for iOS & Mac OS X'
     s.author = {
         'Axel Etcheverry' => 'axel@etcheverry.biz'

diff --git a/Glide/GlideUtils.m b/Glide/GlideUtils.m
@@ -22,16 +22,16 @@ + (nullable NSString *)leftTrimOfString:(nonnull NSString *)string {
 
 + (nullable NSString *)md5:(nonnull NSString *)value {
     const char *cstr = [value UTF8String];
-    unsigned char result[16];
-    CC_MD5(cstr, (uint)strlen(cstr), result);
+    unsigned char digest[CC_MD5_DIGEST_LENGTH];
+    CC_MD5(cstr, (CC_LONG)strlen(cstr), digest);
 
-    return [[NSString stringWithFormat:
-             @"%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X",
-             result[0], result[1], result[2], result[3],
-             result[4], result[5], result[6], result[7],
-             result[8], result[9], result[10], result[11],
-             result[12], result[13], result[14], result[15]
-             ] lowercaseString];
+    NSMutableString *md5 = [[NSMutableString alloc] initWithCapacity:CC_MD5_DIGEST_LENGTH * 2];
+
+    for (NSInteger i = 0; i < CC_MD5_DIGEST_LENGTH; i++) {
+        [md5 appendFormat: @"%02x", (int)digest[i]];
+    }
+
+    return [md5 lowercaseString];
 }
 
 @end
diff --git a/Makefile b/Makefile
@@ -8,4 +8,9 @@ release:
 	@sed "s/@VERSION@/$(version)/g" < Glide.podspec.dist > Glide.podspec
 	@git commit -am "chore(pod): tag version"
 	@git flow release finish $(version)
+	@git push
+	@git push --tags
+	@git checkout master
+	@git push
+	@git checkout develop
 	@pod trunk push Glide.podspec