You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by mr...@apache.org on 2016/09/15 19:02:23 UTC

[01/10] usergrid-swift git commit: Adding podspec

Repository: usergrid-swift
Updated Branches:
  refs/heads/master fa94639c2 -> 0dc647046


Adding podspec


Project: http://git-wip-us.apache.org/repos/asf/usergrid-swift/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid-swift/commit/0923c336
Tree: http://git-wip-us.apache.org/repos/asf/usergrid-swift/tree/0923c336
Diff: http://git-wip-us.apache.org/repos/asf/usergrid-swift/diff/0923c336

Branch: refs/heads/master
Commit: 0923c3360dd97609a52434df08e6bfbf48fb70cc
Parents: fa94639
Author: Robert Walsh <rj...@gmail.com>
Authored: Wed Sep 14 08:09:27 2016 -0500
Committer: Robert Walsh <rj...@gmail.com>
Committed: Wed Sep 14 08:09:27 2016 -0500

----------------------------------------------------------------------
 UsergridSDK.podspec | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/usergrid-swift/blob/0923c336/UsergridSDK.podspec
----------------------------------------------------------------------
diff --git a/UsergridSDK.podspec b/UsergridSDK.podspec
new file mode 100644
index 0000000..4aeabd9
--- /dev/null
+++ b/UsergridSDK.podspec
@@ -0,0 +1,18 @@
+Pod::Spec.new do |s|
+  s.name = 'UsergridSDK'
+  s.version = '2.1.1'
+  s.summary = 'Usergrid SDK written in Swift'
+  s.homepage = 'https://github.com/apache/usergrid-swift'
+  s.license = 'Apache 2.0'
+  s.author = { 'Robert Walsh' => 'rjwalsh1985@gmail.com' }
+  s.social_media_url = 'https://twitter.com/usergrid'
+  s.requires_arc = true
+
+  s.ios.deployment_target = '8.0'
+  s.watchos.deployment_target = '2.1'
+  s.tvos.deployment_target = '9.1'
+  s.osx.deployment_target = '10.11'
+
+  s.source = { :git => 'https://github.com/apache/usergrid-swift.git', :branch => 'master' }
+  s.source_files  = 'Source/*.swift'
+end

[04/10] usergrid-swift git commit: Fixing test

Posted by mr...@apache.org.
Fixing test


Project: http://git-wip-us.apache.org/repos/asf/usergrid-swift/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid-swift/commit/2b139b36
Tree: http://git-wip-us.apache.org/repos/asf/usergrid-swift/tree/2b139b36
Diff: http://git-wip-us.apache.org/repos/asf/usergrid-swift/diff/2b139b36

Branch: refs/heads/master
Commit: 2b139b3687fe3d8fb2269bf2cb4c12e738c05aea
Parents: 39568c0
Author: Robert Walsh <rj...@gmail.com>
Authored: Wed Sep 14 10:29:52 2016 -0500
Committer: Robert Walsh <rj...@gmail.com>
Committed: Wed Sep 14 10:29:52 2016 -0500

----------------------------------------------------------------------
 Tests/ASSET_Tests.swift | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/usergrid-swift/blob/2b139b36/Tests/ASSET_Tests.swift
----------------------------------------------------------------------
diff --git a/Tests/ASSET_Tests.swift b/Tests/ASSET_Tests.swift
index c6f860f..a8c8344 100644
--- a/Tests/ASSET_Tests.swift
+++ b/Tests/ASSET_Tests.swift
@@ -240,9 +240,9 @@ class ASSET_Tests: XCTestCase {
                                 "etag":"dfa7421ea4f35d33e12ba93979a46b7e",
                                 "checkSum":"dfa7421ea4f35d33e12ba93979a46b7e",
                                 "content-length":1417896,
-                                "last-modified":1455728898545]
+                                "last-modified":Int(NSDate().timeIntervalSince1970 * Double(1000))]
         
-        let fileMetaData = UsergridFileMetaData(fileMetaDataJSON:fileMetaDataDict)
+        let fileMetaData = UsergridFileMetaData(fileMetaDataJSON:fileMetaDataDict as! [String : AnyObject])
 
         let fileMetaDataCodingData = NSKeyedArchiver.archivedDataWithRootObject(fileMetaData)
         let newInstanceFromData = NSKeyedUnarchiver.unarchiveObjectWithData(fileMetaDataCodingData) as? UsergridFileMetaData

[03/10] usergrid-swift git commit: Fixed test.

Posted by mr...@apache.org.
Fixed test.


Project: http://git-wip-us.apache.org/repos/asf/usergrid-swift/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid-swift/commit/39568c0e
Tree: http://git-wip-us.apache.org/repos/asf/usergrid-swift/tree/39568c0e
Diff: http://git-wip-us.apache.org/repos/asf/usergrid-swift/diff/39568c0e

Branch: refs/heads/master
Commit: 39568c0eb271c42e922285dfd17c47d31376e17b
Parents: 2202326
Author: Robert Walsh <rj...@gmail.com>
Authored: Wed Sep 14 09:21:41 2016 -0500
Committer: Robert Walsh <rj...@gmail.com>
Committed: Wed Sep 14 09:21:41 2016 -0500

----------------------------------------------------------------------
 Tests/GET_Tests.swift | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/usergrid-swift/blob/39568c0e/Tests/GET_Tests.swift
----------------------------------------------------------------------
diff --git a/Tests/GET_Tests.swift b/Tests/GET_Tests.swift
index 2b0331f..76ca828 100644
--- a/Tests/GET_Tests.swift
+++ b/Tests/GET_Tests.swift
@@ -102,8 +102,8 @@ class GET_Tests: XCTestCase {
                 XCTAssertTrue(NSThread.isMainThread())
                 XCTAssertTrue(nextPageResponse.ok)
                 XCTAssertNotNil(nextPageResponse)
-                XCTAssertFalse(nextPageResponse.hasNextPage)
-                XCTAssertEqual(nextPageResponse.entities!.count, 7)
+                XCTAssertTrue(nextPageResponse.hasNextPage)
+                XCTAssertEqual(nextPageResponse.entities!.count, 10)
                 getExpect.fulfill()
             }
         }

[02/10] usergrid-swift git commit: Updating version to 2.1.2

Posted by mr...@apache.org.
Updating version to 2.1.2


Project: http://git-wip-us.apache.org/repos/asf/usergrid-swift/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid-swift/commit/2202326c
Tree: http://git-wip-us.apache.org/repos/asf/usergrid-swift/tree/2202326c
Diff: http://git-wip-us.apache.org/repos/asf/usergrid-swift/diff/2202326c

Branch: refs/heads/master
Commit: 2202326c6836013248b26495dbe085985ff60087
Parents: 0923c33
Author: Robert Walsh <rj...@gmail.com>
Authored: Wed Sep 14 08:13:42 2016 -0500
Committer: Robert Walsh <rj...@gmail.com>
Committed: Wed Sep 14 08:13:42 2016 -0500

----------------------------------------------------------------------
 Source/Usergrid.swift | 2 +-
 UsergridSDK.podspec   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/usergrid-swift/blob/2202326c/Source/Usergrid.swift
----------------------------------------------------------------------
diff --git a/Source/Usergrid.swift b/Source/Usergrid.swift
index 063d361..ac87380 100644
--- a/Source/Usergrid.swift
+++ b/Source/Usergrid.swift
@@ -27,7 +27,7 @@
 import Foundation
 
 /// The version number for the Usergrid Swift SDK.
-public let UsergridSDKVersion = "2.1.1"
+public let UsergridSDKVersion = "2.1.2"
 
 /**
  The `Usergrid` class acts as a static shared instance manager for the `UsergridClient` class.

http://git-wip-us.apache.org/repos/asf/usergrid-swift/blob/2202326c/UsergridSDK.podspec
----------------------------------------------------------------------
diff --git a/UsergridSDK.podspec b/UsergridSDK.podspec
index 4aeabd9..b3b84f6 100644
--- a/UsergridSDK.podspec
+++ b/UsergridSDK.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name = 'UsergridSDK'
-  s.version = '2.1.1'
+  s.version = '2.1.2'
   s.summary = 'Usergrid SDK written in Swift'
   s.homepage = 'https://github.com/apache/usergrid-swift'
   s.license = 'Apache 2.0'

[08/10] usergrid-swift git commit: Updating README

Posted by mr...@apache.org.
Updating README


Project: http://git-wip-us.apache.org/repos/asf/usergrid-swift/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid-swift/commit/7a69131e
Tree: http://git-wip-us.apache.org/repos/asf/usergrid-swift/tree/7a69131e
Diff: http://git-wip-us.apache.org/repos/asf/usergrid-swift/diff/7a69131e

Branch: refs/heads/master
Commit: 7a69131ea4169a2c92f5d998df9ce3b7aff503d9
Parents: 43ad9cc
Author: Robert Walsh <rj...@gmail.com>
Authored: Wed Sep 14 13:06:06 2016 -0500
Committer: Robert Walsh <rj...@gmail.com>
Committed: Wed Sep 14 13:06:06 2016 -0500

----------------------------------------------------------------------
 README.md | 29 +++++++++++++++++++++++++----
 1 file changed, 25 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/usergrid-swift/blob/7a69131e/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index cf1f071..b6552bd 100644
--- a/README.md
+++ b/README.md
@@ -2,6 +2,7 @@
 
 [![Platform](https://img.shields.io/cocoapods/p/UsergridSDK.svg?style=flat)](http://cocoadocs.org/docsets/UsergridSDK)
 [![CocoaPods Compatible](https://img.shields.io/cocoapods/v/UsergridSDK.svg)](https://cocoapods.org/pods/UsergridSDK)
+[![Carthage Compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage)
 
 Usergrid SDK written in Swift 
 
@@ -16,9 +17,7 @@ Usergrid SDK written in Swift
 
 ## Installation
 
-> **Embedded frameworks require a minimum deployment target of iOS 8 or OS X Mavericks (10.9).**
-
-### CocoaPods
+### [CocoaPods](http://cocoapods.org)
 
 > **CocoaPods 0.39.0+ is required to build the UsergridSDK library.**
 
@@ -37,8 +36,30 @@ Then, run the following command:
 $ pod install
 ```
 
+### [Carthage](https://github.com/Carthage/Carthage)
+
+Carthage is a decentralized dependency manager that builds your dependencies and provides you with binary frameworks.
+
+You can install Carthage with [Homebrew](http://brew.sh/) using the following command:
+
+```bash
+$ brew update
+$ brew install carthage
+```
+
+To integrate the UsergridSDK into your Xcode project using Carthage, specify it in your `Cartfile`:
+
+```ogdl
+github "apache/usergrid-swift" "master"
+```
+
+Run `carthage update` to build the framework and drag the built `UsergridSDK.framework` into your Xcode project.
+
+
 ### Embedded Framework
 
+> **Embedded frameworks require a minimum deployment target of iOS 8 or OS X Mavericks (10.9).**
+
 - Open up Terminal, `cd` into your top-level project directory, and run the following command "if" your project is not initialized as a git repository:
 
 ```bash
@@ -51,7 +72,7 @@ $ git init
 $ git submodule add https://github.com/apache/usergrid
 ```
 
-- Open the `sdks/swift` folder, and drag the `UsergridSDK.xcodeproj` into the Project Navigator of your application's Xcode project.
+- Drag the `UsergridSDK.xcodeproj` into the Project Navigator of your application's Xcode project.
 
 > It should appear nested underneath your application's blue project icon.

[05/10] usergrid-swift git commit: Adding travis ci integration testing.

Posted by mr...@apache.org.
Adding travis ci integration testing.


Project: http://git-wip-us.apache.org/repos/asf/usergrid-swift/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid-swift/commit/5f1de0da
Tree: http://git-wip-us.apache.org/repos/asf/usergrid-swift/tree/5f1de0da
Diff: http://git-wip-us.apache.org/repos/asf/usergrid-swift/diff/5f1de0da

Branch: refs/heads/master
Commit: 5f1de0da19446f97fd6f29f73c95d46200675c47
Parents: 2b139b3
Author: Robert Walsh <rj...@gmail.com>
Authored: Wed Sep 14 10:35:26 2016 -0500
Committer: Robert Walsh <rj...@gmail.com>
Committed: Wed Sep 14 10:35:26 2016 -0500

----------------------------------------------------------------------
 .travis.yml | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/usergrid-swift/blob/5f1de0da/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..18791aa
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,51 @@
+language: objective-c
+osx_image: xcode7.3
+env:
+  global:
+  - LC_CTYPE=en_US.UTF-8
+  - LANG=en_US.UTF-8
+  - PROJECT=UsergridSDK.xcodeproj
+  - IOS_FRAMEWORK_SCHEME="UsergridSDK iOS"
+  - OSX_FRAMEWORK_SCHEME="UsergridSDK OSX"
+  - TVOS_FRAMEWORK_SCHEME="UsergridSDK tvOS"
+  - WATCHOS_FRAMEWORK_SCHEME="UsergridSDK watchOS"
+  - IOS_SDK=iphonesimulator9.3
+  - OSX_SDK=macosx10.11
+  - TVOS_SDK=appletvsimulator9.2
+  - WATCHOS_SDK=watchsimulator2.2
+  - EXAMPLE_SCHEME="iOS Example"
+  matrix:
+    - DESTINATION="OS=8.1,name=iPhone 4S"          SCHEME="$IOS_FRAMEWORK_SCHEME"     SDK="$IOS_SDK"     RUN_TESTS="YES" POD_LINT="YES"
+    - DESTINATION="OS=8.2,name=iPhone 5"           SCHEME="$IOS_FRAMEWORK_SCHEME"     SDK="$IOS_SDK"     RUN_TESTS="YES" POD_LINT="NO"
+    - DESTINATION="OS=8.3,name=iPhone 5S"          SCHEME="$IOS_FRAMEWORK_SCHEME"     SDK="$IOS_SDK"     RUN_TESTS="YES" POD_LINT="NO"
+    - DESTINATION="OS=8.4,name=iPhone 6"           SCHEME="$IOS_FRAMEWORK_SCHEME"     SDK="$IOS_SDK"     RUN_TESTS="YES" POD_LINT="NO"
+    - DESTINATION="OS=9.0,name=iPhone 6"           SCHEME="$IOS_FRAMEWORK_SCHEME"     SDK="$IOS_SDK"     RUN_TESTS="YES" POD_LINT="NO"
+    - DESTINATION="OS=9.1,name=iPhone 6 Plus"      SCHEME="$IOS_FRAMEWORK_SCHEME"     SDK="$IOS_SDK"     RUN_TESTS="YES" POD_LINT="NO"
+    - DESTINATION="OS=9.2,name=iPhone 6S"          SCHEME="$IOS_FRAMEWORK_SCHEME"     SDK="$IOS_SDK"     RUN_TESTS="YES" POD_LINT="NO"
+    - DESTINATION="OS=9.3,name=iPhone 6S Plus"     SCHEME="$IOS_FRAMEWORK_SCHEME"     SDK="$IOS_SDK"     RUN_TESTS="YES" POD_LINT="NO"
+    - DESTINATION="arch=x86_64"                    SCHEME="$OSX_FRAMEWORK_SCHEME"     SDK="$OSX_SDK"     RUN_TESTS="YES"  POD_LINT="NO"
+    - DESTINATION="OS=9.2,name=Apple TV 1080p"     SCHEME="$TVOS_FRAMEWORK_SCHEME"    SDK="$TVOS_SDK"    RUN_TESTS="YES" POD_LINT="NO"
+    - DESTINATION="OS=2.2,name=Apple Watch - 42mm" SCHEME="$WATCHOS_FRAMEWORK_SCHEME" SDK="$WATCHOS_SDK" RUN_TESTS="NO" POD_LINT="NO"
+script:
+  - set -o pipefail
+  - xcodebuild -version
+  - xcodebuild -showsdks
+
+  # Build Framework in Debug and Run Tests if specified
+  - if [ $RUN_TESTS == "YES" ]; then
+      xcodebuild -project "$PROJECT" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO ENABLE_TESTABILITY=YES test | xcpretty -c;
+    else
+      xcodebuild -project "$PROJECT" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO build | xcpretty -c;
+    fi
+
+  # Build Framework in Release and Run Tests if specified
+  - if [ $RUN_TESTS == "YES" ]; then
+      xcodebuild -project "$PROJECT" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Release ONLY_ACTIVE_ARCH=NO ENABLE_TESTABILITY=YES test | xcpretty -c;
+    else
+      xcodebuild -project "$PROJECT" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Release ONLY_ACTIVE_ARCH=NO build | xcpretty -c;
+    fi
+
+  # Run `pod lib lint` if specified
+  - if [ $POD_LINT == "YES" ]; then
+      pod lib lint --allow-warnings;
+    fi

[07/10] usergrid-swift git commit: Adding xcode workspace and updating travis.yml

Posted by mr...@apache.org.
Adding xcode workspace and updating travis.yml


Project: http://git-wip-us.apache.org/repos/asf/usergrid-swift/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid-swift/commit/43ad9ccb
Tree: http://git-wip-us.apache.org/repos/asf/usergrid-swift/tree/43ad9ccb
Diff: http://git-wip-us.apache.org/repos/asf/usergrid-swift/diff/43ad9ccb

Branch: refs/heads/master
Commit: 43ad9ccb31b84eaacecfc4dd9ab5a0aaad425f0b
Parents: 44a7ae0
Author: Robert Walsh <rj...@gmail.com>
Authored: Wed Sep 14 11:32:00 2016 -0500
Committer: Robert Walsh <rj...@gmail.com>
Committed: Wed Sep 14 11:32:00 2016 -0500

----------------------------------------------------------------------
 .travis.yml                                      | 10 +++++-----
 UsergridSDK.xcworkspace/contents.xcworkspacedata |  7 +++++++
 2 files changed, 12 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/usergrid-swift/blob/43ad9ccb/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 5c8e5cf..2eb2c06 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,7 @@ env:
   global:
   - LC_CTYPE=en_US.UTF-8
   - LANG=en_US.UTF-8
-  - PROJECT=UsergridSDK.xcodeproj
+  - WORKSPACE=UsergridSDK.xcworkspace
   - IOS_FRAMEWORK_SCHEME="UsergridSDK iOS"
   - OSX_FRAMEWORK_SCHEME="UsergridSDK OSX"
   - TVOS_FRAMEWORK_SCHEME="UsergridSDK tvOS"
@@ -25,14 +25,14 @@ script:
 
   # Build Framework in Debug and Run Tests if specified
   - if [ $RUN_TESTS == "YES" ]; then
-      xcodebuild -project "$PROJECT" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO ENABLE_TESTABILITY=YES test | xcpretty -c;
+      xcodebuild -workspace "$WORKSPACE" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO ENABLE_TESTABILITY=YES test | xcpretty -c;
     else
-      xcodebuild -project "$PROJECT" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO build | xcpretty -c;
+      xcodebuild -workspace "$WORKSPACE" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO build | xcpretty -c;
     fi
 
   # Build Framework in Release and Run Tests if specified
   - if [ $RUN_TESTS == "YES" ]; then
-      xcodebuild -project "$PROJECT" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Release ONLY_ACTIVE_ARCH=NO ENABLE_TESTABILITY=YES test | xcpretty -c;
+      xcodebuild -workspace "$WORKSPACE" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Release ONLY_ACTIVE_ARCH=NO ENABLE_TESTABILITY=YES test | xcpretty -c;
     else
-      xcodebuild -project "$PROJECT" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Release ONLY_ACTIVE_ARCH=NO build | xcpretty -c;
+      xcodebuild -workspace "$WORKSPACE" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Release ONLY_ACTIVE_ARCH=NO build | xcpretty -c;
     fi
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/usergrid-swift/blob/43ad9ccb/UsergridSDK.xcworkspace/contents.xcworkspacedata
----------------------------------------------------------------------
diff --git a/UsergridSDK.xcworkspace/contents.xcworkspacedata b/UsergridSDK.xcworkspace/contents.xcworkspacedata
new file mode 100644
index 0000000..c4efa30
--- /dev/null
+++ b/UsergridSDK.xcworkspace/contents.xcworkspacedata
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "group:UsergridSDK.xcodeproj">
+   </FileRef>
+</Workspace>

[09/10] usergrid-swift git commit: Update to travis.yml

Posted by mr...@apache.org.
Update to travis.yml


Project: http://git-wip-us.apache.org/repos/asf/usergrid-swift/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid-swift/commit/1500c160
Tree: http://git-wip-us.apache.org/repos/asf/usergrid-swift/tree/1500c160
Diff: http://git-wip-us.apache.org/repos/asf/usergrid-swift/diff/1500c160

Branch: refs/heads/master
Commit: 1500c160e2bdb65981e816180fa47fd8a42860bb
Parents: 7a69131
Author: Robert Walsh <rj...@gmail.com>
Authored: Wed Sep 14 13:16:31 2016 -0500
Committer: Robert Walsh <rj...@gmail.com>
Committed: Wed Sep 14 13:16:31 2016 -0500

----------------------------------------------------------------------
 .travis.yml | 1 -
 1 file changed, 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/usergrid-swift/blob/1500c160/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 2eb2c06..2f043b5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,7 +19,6 @@ env:
     - DESTINATION="OS=9.2,name=Apple TV 1080p"     SCHEME="$TVOS_FRAMEWORK_SCHEME"    SDK="$TVOS_SDK"    RUN_TESTS="YES"
     - DESTINATION="OS=2.2,name=Apple Watch - 42mm" SCHEME="$WATCHOS_FRAMEWORK_SCHEME" SDK="$WATCHOS_SDK" RUN_TESTS="NO"
 script:
-  - set -o pipefail
   - xcodebuild -version
   - xcodebuild -showsdks

[10/10] usergrid-swift git commit: Added SWIFT_VERSION build setting.

Posted by mr...@apache.org.
Added SWIFT_VERSION build setting.

Allows the project to still be built when using Xcode 8.


Project: http://git-wip-us.apache.org/repos/asf/usergrid-swift/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid-swift/commit/0dc64704
Tree: http://git-wip-us.apache.org/repos/asf/usergrid-swift/tree/0dc64704
Diff: http://git-wip-us.apache.org/repos/asf/usergrid-swift/diff/0dc64704

Branch: refs/heads/master
Commit: 0dc6470466b785fba80e727521bfbe30f025a822
Parents: 1500c16
Author: Robert Walsh <rj...@gmail.com>
Authored: Wed Sep 14 18:20:50 2016 -0500
Committer: Robert Walsh <rj...@gmail.com>
Committed: Wed Sep 14 18:20:50 2016 -0500

----------------------------------------------------------------------
 UsergridSDK.xcodeproj/project.pbxproj | 4 ++++
 1 file changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/usergrid-swift/blob/0dc64704/UsergridSDK.xcodeproj/project.pbxproj
----------------------------------------------------------------------
diff --git a/UsergridSDK.xcodeproj/project.pbxproj b/UsergridSDK.xcodeproj/project.pbxproj
index 338835c..340b9b1 100644
--- a/UsergridSDK.xcodeproj/project.pbxproj
+++ b/UsergridSDK.xcodeproj/project.pbxproj
@@ -970,6 +970,7 @@
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 2.3;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
@@ -1011,6 +1012,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
+				SWIFT_VERSION = 2.3;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
 				VERSIONING_SYSTEM = "apple-generic";
@@ -1035,6 +1037,7 @@
 				PRODUCT_NAME = UsergridSDK;
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 2.3;
 			};
 			name = Debug;
 		};
@@ -1054,6 +1057,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = org.apache.usergrid.swift;
 				PRODUCT_NAME = UsergridSDK;
 				SKIP_INSTALL = YES;
+				SWIFT_VERSION = 2.3;
 			};
 			name = Release;
 		};

[06/10] usergrid-swift git commit: Updated travis.yml

Posted by mr...@apache.org.
Updated travis.yml


Project: http://git-wip-us.apache.org/repos/asf/usergrid-swift/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid-swift/commit/44a7ae0c
Tree: http://git-wip-us.apache.org/repos/asf/usergrid-swift/tree/44a7ae0c
Diff: http://git-wip-us.apache.org/repos/asf/usergrid-swift/diff/44a7ae0c

Branch: refs/heads/master
Commit: 44a7ae0cf4f0bcde76967286be5d82bd9e78c97b
Parents: 5f1de0d
Author: Robert Walsh <rj...@gmail.com>
Authored: Wed Sep 14 11:19:30 2016 -0500
Committer: Robert Walsh <rj...@gmail.com>
Committed: Wed Sep 14 11:19:30 2016 -0500

----------------------------------------------------------------------
 .travis.yml | 23 +++++------------------
 1 file changed, 5 insertions(+), 18 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/usergrid-swift/blob/44a7ae0c/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 18791aa..5c8e5cf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,19 +13,11 @@ env:
   - OSX_SDK=macosx10.11
   - TVOS_SDK=appletvsimulator9.2
   - WATCHOS_SDK=watchsimulator2.2
-  - EXAMPLE_SCHEME="iOS Example"
   matrix:
-    - DESTINATION="OS=8.1,name=iPhone 4S"          SCHEME="$IOS_FRAMEWORK_SCHEME"     SDK="$IOS_SDK"     RUN_TESTS="YES" POD_LINT="YES"
-    - DESTINATION="OS=8.2,name=iPhone 5"           SCHEME="$IOS_FRAMEWORK_SCHEME"     SDK="$IOS_SDK"     RUN_TESTS="YES" POD_LINT="NO"
-    - DESTINATION="OS=8.3,name=iPhone 5S"          SCHEME="$IOS_FRAMEWORK_SCHEME"     SDK="$IOS_SDK"     RUN_TESTS="YES" POD_LINT="NO"
-    - DESTINATION="OS=8.4,name=iPhone 6"           SCHEME="$IOS_FRAMEWORK_SCHEME"     SDK="$IOS_SDK"     RUN_TESTS="YES" POD_LINT="NO"
-    - DESTINATION="OS=9.0,name=iPhone 6"           SCHEME="$IOS_FRAMEWORK_SCHEME"     SDK="$IOS_SDK"     RUN_TESTS="YES" POD_LINT="NO"
-    - DESTINATION="OS=9.1,name=iPhone 6 Plus"      SCHEME="$IOS_FRAMEWORK_SCHEME"     SDK="$IOS_SDK"     RUN_TESTS="YES" POD_LINT="NO"
-    - DESTINATION="OS=9.2,name=iPhone 6S"          SCHEME="$IOS_FRAMEWORK_SCHEME"     SDK="$IOS_SDK"     RUN_TESTS="YES" POD_LINT="NO"
-    - DESTINATION="OS=9.3,name=iPhone 6S Plus"     SCHEME="$IOS_FRAMEWORK_SCHEME"     SDK="$IOS_SDK"     RUN_TESTS="YES" POD_LINT="NO"
-    - DESTINATION="arch=x86_64"                    SCHEME="$OSX_FRAMEWORK_SCHEME"     SDK="$OSX_SDK"     RUN_TESTS="YES"  POD_LINT="NO"
-    - DESTINATION="OS=9.2,name=Apple TV 1080p"     SCHEME="$TVOS_FRAMEWORK_SCHEME"    SDK="$TVOS_SDK"    RUN_TESTS="YES" POD_LINT="NO"
-    - DESTINATION="OS=2.2,name=Apple Watch - 42mm" SCHEME="$WATCHOS_FRAMEWORK_SCHEME" SDK="$WATCHOS_SDK" RUN_TESTS="NO" POD_LINT="NO"
+    - DESTINATION="OS=9.3,name=iPhone 6S Plus"     SCHEME="$IOS_FRAMEWORK_SCHEME"     SDK="$IOS_SDK"     RUN_TESTS="YES"
+    - DESTINATION="arch=x86_64"                    SCHEME="$OSX_FRAMEWORK_SCHEME"     SDK="$OSX_SDK"     RUN_TESTS="YES"
+    - DESTINATION="OS=9.2,name=Apple TV 1080p"     SCHEME="$TVOS_FRAMEWORK_SCHEME"    SDK="$TVOS_SDK"    RUN_TESTS="YES"
+    - DESTINATION="OS=2.2,name=Apple Watch - 42mm" SCHEME="$WATCHOS_FRAMEWORK_SCHEME" SDK="$WATCHOS_SDK" RUN_TESTS="NO"
 script:
   - set -o pipefail
   - xcodebuild -version
@@ -43,9 +35,4 @@ script:
       xcodebuild -project "$PROJECT" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Release ONLY_ACTIVE_ARCH=NO ENABLE_TESTABILITY=YES test | xcpretty -c;
     else
       xcodebuild -project "$PROJECT" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Release ONLY_ACTIVE_ARCH=NO build | xcpretty -c;
-    fi
-
-  # Run `pod lib lint` if specified
-  - if [ $POD_LINT == "YES" ]; then
-      pod lib lint --allow-warnings;
-    fi
+    fi
\ No newline at end of file