Skip to content

Commit 31b7922

Browse files
authored
chore: ci updates for windows (#531)
1 parent 820037e commit 31b7922

File tree

5 files changed

+26
-4
lines changed

5 files changed

+26
-4
lines changed

builder.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
],
1414
"build_dir": "target/build",
1515
"build_steps": [
16-
"pwd",
1716
"{gradlew} assemble --parallel"
1817
],
1918
"post_build_steps": [

gradle.properties

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@ kotlin.incremental.multiplatform=true
44
kotlin.mpp.stability.nowarn=true
55
kotlin.native.ignoreDisabledTargets=true
66

7-
# gradle
8-
org.gradle.jvmargs=-Xmx6g -XX:MaxPermSize=6g
9-
107
# android
118
android.useAndroidX=true
129
android.enableJetifier=true

runtime/testing/build.gradle.kts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ description = "Internal test utilities"
77

88
val coroutinesVersion: String by project
99
val kotlinVersion: String by project
10+
val junitVersion: String by project
1011

1112
kotlin {
1213
sourceSets {
@@ -18,6 +19,7 @@ kotlin {
1819
}
1920
jvmMain {
2021
dependencies {
22+
api("org.junit.jupiter:junit-jupiter:$junitVersion")
2123
implementation("org.jetbrains.kotlin:kotlin-test:$kotlinVersion")
2224
api("org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutinesVersion")
2325
}
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
/*
2+
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
3+
* SPDX-License-Identifier: Apache-2.0.
4+
*/
5+
6+
package aws.smithy.kotlin.runtime.testing
7+
8+
/**
9+
* Ignore test for Windows targets
10+
*/
11+
@Target(AnnotationTarget.CLASS, AnnotationTarget.FUNCTION)
12+
@Retention(AnnotationRetention.RUNTIME)
13+
expect annotation class IgnoreWindows(val reason: String = "")
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
/*
2+
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
3+
* SPDX-License-Identifier: Apache-2.0.
4+
*/
5+
6+
package aws.smithy.kotlin.runtime.testing
7+
import org.junit.jupiter.api.condition.DisabledOnOs
8+
import org.junit.jupiter.api.condition.OS
9+
10+
@DisabledOnOs(OS.WINDOWS)
11+
actual annotation class IgnoreWindows(actual val reason: String)

0 commit comments

Comments
 (0)