chore: refresh Mac CI targets, enable parallel builds by default (#1440)

Author: ianbotsf

.github/workflows/continuous-integration.yml

@@ -90,13 +90,15 @@ jobs:
             WorkflowSucceeded:${{ job.status == 'success' && '1' || '0' }}:Count
             WorkflowDuration:${{ steps.end.outputs.duration }}:Seconds
 
-  # macos-14 build and test for targets: jvm, macoArm64, iosSimulatorArm64, watchosSimulatorArm65, tvosSimulatorArm64
-  # macos-13 build and test for targets: jvm, macoX64, iosX64, tvosX64, watchosX64
+  # macOS ARM images build and test for targets: jvm, macosArm64, iosSimulatorArm64, watchosSimulatorArm65, tvosSimulatorArm64
+  # macos x64 images build and test for targets: jvm, macosX64, iosX64, tvosX64, watchosX64
   macos:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-14, macos-13]
+        os:
+          - macos-15-large  # x64
+          - macos-15-xlarge # ARM
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout sources
@@ -111,6 +113,17 @@ jobs:
         working-directory: ./smithy-kotlin
         shell: bash
         run: |
+          # Bump memory profile for Kotlin daemon
+          cat gradle.properties \
+              | sed -r 's/-Xmx[0-9]+G/-Xmx6G/g' \
+              | sed -r 's/-XX:MaxMetaspaceSize=[0-9]+G/-XX:MaxMetaspaceSize=2G/g' \
+              > gradle.properties2
+          mv gradle.properties2 gradle.properties
+
+          echo "Modified gradle.properties:"
+          cat gradle.properties
+          echo ""
+
           # FIXME K2. Re-enable warnings as errors after this warning is removed: https://youtrack.jetbrains.com/issue/KT-68532
           # echo "kotlinWarningsAsErrors=true" >> $GITHUB_WORKSPACE/local.properties              
           ./gradlew apiCheck
@@ -369,7 +382,7 @@ jobs:
       run: |
         # TODO - JVM only
         cd $GITHUB_WORKSPACE/smithy-kotlin
-        ./gradlew --parallel -Paws.kotlin.native=false publishToMavenLocal
+        ./gradlew -Paws.kotlin.native=false publishToMavenLocal
         SMITHY_KOTLIN_RUNTIME_VERSION=$(grep sdkVersion= gradle.properties | cut -d = -f 2)
         SMITHY_KOTLIN_CODEGEN_VERSION=$(grep codegenVersion= gradle.properties | cut -d = -f 2)
         cd $GITHUB_WORKSPACE/aws-sdk-kotlin
@@ -380,7 +393,7 @@ jobs:
         # smithy-kotlin should be
         sed -i "s/smithy-kotlin-runtime-version = .*$/smithy-kotlin-runtime-version = \"$SMITHY_KOTLIN_RUNTIME_VERSION\"/" gradle/libs.versions.toml
         sed -i "s/smithy-kotlin-codegen-version = .*$/smithy-kotlin-codegen-version = \"$SMITHY_KOTLIN_CODEGEN_VERSION\"/" gradle/libs.versions.toml
-        ./gradlew --parallel -Paws.kotlin.native=false publishToMavenLocal
+        ./gradlew -Paws.kotlin.native=false publishToMavenLocal
         ./gradlew -Paws.kotlin.native=false test jvmTest
         ./gradlew -Paws.kotlin.native=false testAllProtocols
     - name: Calculate duration

builder.json

@@ -13,7 +13,7 @@
     ],
     "build_dir": "target/build",
     "build_steps": [
-        "{gradlew} assemble --parallel" 
+        "{gradlew} assemble"
     ],
     "post_build_steps": [
         "{gradlew} publishToMavenLocal" 

gradle.properties

@@ -12,6 +12,7 @@ kotlinx.atomicfu.enableNativeIrTransformation=false
 
 # gradle
 org.gradle.jvmargs=-Xmx2G -XX:MaxMetaspaceSize=1G
+org.gradle.parallel=true
 
 # SDK
 sdkVersion=1.5.15-SNAPSHOT
@@ -21,4 +22,4 @@ codegenVersion=0.35.15-SNAPSHOT
 
 # FIXME Remove after Dokka 2.0 Gradle plugin is stable
 org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled
-org.jetbrains.dokka.experimental.gradle.pluginMode.noWarn=true
+org.jetbrains.dokka.experimental.gradle.pluginMode.noWarn=true

runtime/build.gradle.kts

@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import aws.sdk.kotlin.gradle.dsl.configurePublishing
-import aws.sdk.kotlin.gradle.kmp.*
 import aws.sdk.kotlin.gradle.kmp.configureKmpTargets
 import aws.sdk.kotlin.gradle.kmp.kotlin
 import aws.sdk.kotlin.gradle.kmp.needsKmpConfigured
@@ -135,7 +134,7 @@ subprojects {
         }
 
         testLogging {
-            events("passed", "skipped", "failed")
+            events("passed", "skipped", "failed", "standardOut", "standardError")
             showStandardStreams = true
             showStackTraces = true
             showExceptions = true