Merge branch 'ssdev' of github.com:bdonkey/swift-overture into ssdev

* 'ssdev' of github.com:bdonkey/swift-overture: workspace misc work on ssbasic playground misc appcode not sure Move Info.plist (pointfreeco#36) Info.plist for targets (pointfreeco#35) XcodeGen (pointfreeco#32) Update to Swift 4.2 (pointfreeco#29) Bump podspec Update README.md Fix/missing zip with public declaration (pointfreeco#26) Update podspec Signed-off-by: bdonkey <[email protected]> # Conflicts: # .idea/workspace.xml
bdonkey · Jan 11, 2019 · d438d65 · d438d65
2 parents 2093417 + e799783
commit d438d65
Show file tree

Hide file tree

Showing 28 changed files with 2,427 additions and 451 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -3,7 +3,7 @@ version: 2
 jobs:
   build:
     macos:
-      xcode: "9.3.0"
+      xcode: "10.1.0"
 
     steps:
       - checkout
@@ -19,14 +19,10 @@ jobs:
       - run:
           name: Run iOS tests
           command: make test-ios
-          environment:
-            SNAPSHOT_ARTIFACTS: $CIRCLE_ARTIFACTS
 
       - run:
           name: Run macOS tests
           command: make test-macos
-          environment:
-            SNAPSHOT_ARTIFACTS: $CIRCLE_ARTIFACTS
 
       - run:
           name: Run Swift tests

diff --git a/.idea/markdown-exported-files.xml b/.idea/markdown-exported-files.xml
diff --git a/.idea/runConfigurations/Overture_iOS.xml b/.idea/runConfigurations/Overture_iOS.xml
diff --git a/.idea/runConfigurations/Overture_macOS.xml b/.idea/runConfigurations/Overture_macOS.xml
diff --git a/.idea/runConfigurations/Overture_tvOS.xml b/.idea/runConfigurations/Overture_tvOS.xml
diff --git a/.idea/runConfigurations/Overture_Package.xml → .idea/runConfigurations/Overture_watchOS.xml b/.idea/runConfigurations/Overture_Package.xml → .idea/runConfigurations/Overture_watchOS.xml