smithy-lang
diff --git a/‎.circleci/config.yml
Lines changed: 85 additions & 68 deletions b/‎.circleci/config.yml
Lines changed: 85 additions & 68 deletions
diff --git a/‎CircleciScripts/pre_start_iOS_simulator.sh
Lines changed: 32 additions & 0 deletions b/‎CircleciScripts/pre_start_iOS_simulator.sh
Lines changed: 32 additions & 0 deletions
diff --git a/‎ClientRuntime/.build/manifest.db
188 KB b/‎ClientRuntime/.build/manifest.db
188 KB
diff --git a/‎ClientRuntime/.build/workspace-state.json
Lines changed: 1 addition & 0 deletions b/‎ClientRuntime/.build/workspace-state.json
Lines changed: 1 addition & 0 deletions
diff --git a/‎ClientRuntime/.swiftlint.yml
Lines changed: 46 additions & 0 deletions b/‎ClientRuntime/.swiftlint.yml
Lines changed: 46 additions & 0 deletions
diff --git a/‎ClientRuntime/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
Lines changed: 7 additions & 0 deletions b/‎ClientRuntime/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
Lines changed: 7 additions & 0 deletions
diff --git a/‎ClientRuntime/.swiftpm/xcode/package.xcworkspace/xcuserdata/sadiredd.xcuserdatad/UserInterfaceState.xcuserstate
33.2 KB b/‎ClientRuntime/.swiftpm/xcode/package.xcworkspace/xcuserdata/sadiredd.xcuserdatad/UserInterfaceState.xcuserstate
33.2 KB
@@ -84,91 +84,97 @@ commands:
             destination: Reports
             path: build/reports/tests/test/
 
+  pre_start_ios_simulator:
+    description: >-
+      Pre-start iOS Simulator, as the build may fail if it takes too long to start up during that step
+    steps:
+      - run:
+          name: Pre-start iOS Simulator
+          command: |
+            bash CircleciScripts/pre_start_iOS_simulator.sh
+
 jobs:
-  build:
+  build_and_unittest_swift_client_runtime:
+    macos:
+      xcode: "12.1.0"
+    steps:
+      - checkout
+      - pre_start_ios_simulator
+      - run:
+          name: Clone aws-crt-swift
+          command: |
+            rm -rf ~/Library/Developer/Xcode/DerivedData
+            mkdir -p ~/Projects/Amplify/SwiftSDK/
+            cd ~/Projects/Amplify/SwiftSDK/
+            git clone --recursive [email protected]:awslabs/aws-crt-swift.git
+            cd -
+      - run:
+          name: Build ClientRuntime
+          working_directory: ~/project/ClientRuntime
+          command: |
+            xcodebuild -scheme ClientRuntime-Package -destination "${destination}"
+      - run:
+          name: Unit Test ClientRuntime
+          working_directory: ~/project/ClientRuntime
+          command: |
+            xcodebuild test -enableCodeCoverage YES -scheme ClientRuntime-Package -destination "${destination}"
+            bash <(curl -s https://codecov.io/bash)
+      - run:
+          name: Install swiftlint
+          command: |
+            HOMEBREW_NO_AUTO_UPDATE=1 brew install swiftlint
+      - run:
+          name: Lint ClientRuntime
+          working_directory: ~/project/ClientRuntime
+          command: |
+            swiftlint
+
+  build_smithy_swift:
+    macos:
+      xcode: "12.1.0"
     environment:
       # Configure the JVM and Gradle to avoid OOM errors
       _JAVA_OPTIONS: "-Xmx3g"
       GRADLE_OPTS: "-Dorg.gradle.daemon=false -Dorg.gradle.workers.max=2"
-    docker:
-      - image: circleci/openjdk:8
     steps:
       - checkout
       - with_cache:
+          cache_key: "macOSv2"
           steps:
             - run:
-                name: Build Smithy Kotlin
-                working_directory: ~/project/smithy-kotlin
-                command: ./gradlew build -x test -x jvmTest
-            - persist_to_workspace:
-                root: .
-                paths:
-                  - smithy-kotlin/build
-                  - smithy-kotlin/*/build
-                  - smithy-kotlin/client-runtime/*/build
+                name: Clone aws-crt-swift
+                command: |
+                  rm -rf ~/Library/Developer/Xcode/DerivedData
+                  mkdir -p ~/Projects/Amplify/SwiftSDK/
+                  cd ~/Projects/Amplify/SwiftSDK/
+                  git clone --recursive [email protected]:awslabs/aws-crt-swift.git
+                  cd -
             - run:
                 name: Build Smithy Swift
-                working_directory: ~/project/smithy-swift
+                working_directory: ~/project
                 command: ./gradlew build -x test
             - persist_to_workspace:
                 root: .
                 paths:
-                  - smithy-swift/build
-                  - smithy-swift/*/build
-  test_smithy_kotlin:
-    environment:
-      # Configure the JVM and Gradle to avoid OOM errors
-      _JAVA_OPTIONS: "-Xmx3g"
-      GRADLE_OPTS: "-Dorg.gradle.daemon=false -Dorg.gradle.workers.max=2"
-    docker:
-      - image: circleci/openjdk:8
-    steps:
-      - checkout
-      - attach_workspace:
-          at: .
-      - with_cache:
-          steps:
-            - run:
-                working_directory: ~/project/smithy-kotlin
-                name: Run tests
-                command: |
-                  ./gradlew test
-      - collect_test_results:
-          test_results_path: ""
-          reports_path: ""
+                  - ./build
+                  - ./*/build
 
-  lint_smithy_kotlin:
-    # Remove if parallelism is not desired
-    environment:
-      # Configure the JVM and Gradle to avoid OOM errors
-      _JAVA_OPTIONS: "-Xmx3g"
-      GRADLE_OPTS: "-Dorg.gradle.daemon=false -Dorg.gradle.workers.max=2"
-    docker:
-      - image: circleci/openjdk:8
-    steps:
-      - checkout
-      - attach_workspace:
-          at: .
-      - run:
-          working_directory: ~/project/smithy-kotlin
-          name: Run ktlint
-          command: |
-            ./gradlew ktlint
   test_smithy_swift:
+    macos:
+      xcode: "12.1.0"
     environment:
       # Configure the JVM and Gradle to avoid OOM errors
       _JAVA_OPTIONS: "-Xmx3g"
       GRADLE_OPTS: "-Dorg.gradle.daemon=false -Dorg.gradle.workers.max=2"
-    docker:
-      - image: circleci/openjdk:8
     steps:
       - checkout
       - attach_workspace:
           at: .
       - with_cache:
+          cache_key: "macOSv2"
           steps:
             - run:
-                working_directory: ~/project/smithy-swift
+                working_directory: ~/project
                 name: Run tests
                 command: |
                   ./gradlew test
@@ -177,33 +183,44 @@ jobs:
           reports_path: ""
 
   lint_smithy_swift:
-    # Remove if parallelism is not desired
+    macos:
+      xcode: "12.1.0"
     environment:
       # Configure the JVM and Gradle to avoid OOM errors
       _JAVA_OPTIONS: "-Xmx3g"
       GRADLE_OPTS: "-Dorg.gradle.daemon=false -Dorg.gradle.workers.max=2"
-    docker:
-      - image: circleci/openjdk:8
     steps:
       - checkout
       - attach_workspace:
           at: .
       - run:
-          working_directory: ~/project/smithy-swift
+          working_directory: ~/project
           name: Run ktlint
           command: |
             ./gradlew ktlint
-
+            
 workflows:
   version: 2
-  workflow:
+
+  build_and_test_smithy_swift:
     jobs:
-    - build
-    - test_smithy_kotlin:
+    - build_and_unittest_swift_client_runtime:
+        filters:
+            branches:
+              only:
+                - swift-client-runtime
+    - build_smithy_swift:
         requires:
-          - build
-    - lint_smithy_kotlin
+          - build_and_unittest_swift_client_runtime
+        filters:
+            branches:
+              only:
+                - swift-client-runtime
     - test_smithy_swift:
         requires:
-          - build
-    - lint_smithy_swift
+          - build_smithy_swift
+        filters:
+            branches:
+              only:
+                - swift-client-runtime
+    - lint_smithy_swift  
@@ -0,0 +1,32 @@
+# Create simulator if needed
+test_device_id=$( xcrun simctl list devices | grep "circleci-test-device" | sed 's/ *circleci-test-device *(//' | sed 's/).*//' )
+
+if [[ -z $test_device_id ]] ; then
+  echo "Creating test device"
+
+  # Get the most recent available runtime
+  runtime=$( xcrun simctl list runtimes iOS | sed 's/iOS //' | sort -h | tail -1 | sed 's/.* - //' | tr -d '[:space:]' )
+  echo "Runtime: '${runtime}'"
+
+  # Get the last alphabetical device (probably something in the iPhone X family, as of 2019-05-31)
+  devicetype=$( xcrun simctl list devicetypes iPhone | sort | tail -1 | sed 's/.*(//' | sed 's/).*//' | tr -d '[:space:]' )
+  echo "Device type: '${devicetype}'"
+
+  test_device_id=$( xcrun simctl create "circleci-test-device" "${devicetype}" "${runtime}" | tr -d '[:space:]' )
+fi
+
+echo "test_device_id: ${test_device_id}"
+echo "export test_device_id='$test_device_id'" >> $BASH_ENV
+
+# Boot sim if needed
+xcrun simctl list devices ${test_device_id} | grep -q Booted
+if [[ $? -eq 1 ]] ; then
+  echo "Booting ${test_device_id}"
+  xcrun simctl boot ${test_device_id}
+fi
+
+# destinationspecifier for xcodebuild commands
+destination="id=${test_device_id}"
+echo "destination: ${destination}"
+echo "export destination='$destination'" >> $BASH_ENV
+
@@ -0,0 +1 @@
+{"object": {"artifacts": [], "dependencies": [{"basedOn": null, "packageRef": {"identity": "aws-crt-swift", "kind": "local", "name": "AwsCrt", "path": "/Users/sadiredd/Documents/aws-crt-swift"}, "state": {"name": "local"}, "subpath": "aws-crt-swift"}]}, "version": 4}
@@ -0,0 +1,46 @@
+excluded:
+  - Tests
+
+analyzer_rules:
+  - unused_import
+  - unused_declaration
+
+disabled_rules:
+  - trailing_whitespace
+  - todo
+  - identifier_name
+  - compiler_protocol_init
+  - function_parameter_count
+  - multiple_closures_with_trailing_closure
+  - cyclomatic_complexity
+  - file_length
+  - syntactic_sugar
+
+opt_in_rules:
+  - empty_count
+
+# configurable rules can be customized from this configuration file
+force_cast: warning
+closing_brace: error
+colon:
+  severity: error
+comma: error
+empty_count: warning
+empty_enum_arguments: error
+function_body_length:
+  warning: 100
+  error: 150
+identifier_name:
+  excluded:
+    - id
+    - of
+    - or
+line_length:
+  warning: 120
+  error: 160
+opening_brace: error
+return_arrow_whitespace: error
+statement_position:
+  severity: error
+todo: warning
+trailing_semicolon: error
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+{"object": {"artifacts": [], "dependencies": [{"basedOn": null, "packageRef": {"identity": "aws-crt-swift", "kind": "local", "name": "AwsCrt", "path": "/Users/sadiredd/Documents/aws-crt-swift"}, "state": {"name": "local"}, "subpath": "aws-crt-swift"}]}, "version": 4}`