Skip to content

Commit 52d2a97

Browse files
Merge pull request #588 from JoseAlcerreca/warningsAsErrors
[All] Restricts allWarningsAsErrors to CI and local properties.
2 parents 9d07a19 + bd9cf1b commit 52d2a97

File tree

8 files changed

+26
-22
lines changed

8 files changed

+26
-22
lines changed

.github/ci-gradle.properties

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,6 @@ org.gradle.workers.max=2
2121

2222
kotlin.incremental=false
2323
kotlin.compiler.execution.strategy=in-process
24+
25+
# Controls KotlinOptions.allWarningsAsErrors. This is used in CI and can be set in local properties.
26+
warningsAsErrors=true

Crane/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ subprojects {
6060

6161
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
6262
kotlinOptions {
63-
// Treat all Kotlin warnings as errors
64-
allWarningsAsErrors = true
63+
// Treat all Kotlin warnings as errors (disabled by default)
64+
allWarningsAsErrors = project.hasProperty("warningsAsErrors") ? project.warningsAsErrors : false
6565

6666
jvmTarget = "1.8"
6767

JetNews/app/build.gradle

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,6 @@ android {
5757
targetCompatibility JavaVersion.VERSION_1_8
5858
}
5959

60-
kotlinOptions {
61-
jvmTarget = '1.8'
62-
allWarningsAsErrors = true
63-
}
64-
6560
buildFeatures {
6661
compose true
6762
}
@@ -115,8 +110,9 @@ dependencies {
115110

116111
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
117112
kotlinOptions {
118-
// Treat all Kotlin warnings as errors
119-
allWarningsAsErrors = true
113+
// Treat all Kotlin warnings as errors (disabled by default)
114+
allWarningsAsErrors = project.hasProperty("warningsAsErrors") ? project.warningsAsErrors : false
115+
120116
freeCompilerArgs += '-Xopt-in=kotlin.RequiresOptIn'
121117
// Enable experimental coroutines APIs, including Flow
122118
freeCompilerArgs += '-Xopt-in=kotlin.Experimental'

Jetcaster/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@ subprojects {
6161

6262
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
6363
kotlinOptions {
64-
// Treat all Kotlin warnings as errors
65-
allWarningsAsErrors = true
64+
// Treat all Kotlin warnings as errors (disabled by default)
65+
allWarningsAsErrors = project.hasProperty("warningsAsErrors") ? project.warningsAsErrors : false
6666

6767
freeCompilerArgs += '-Xopt-in=kotlin.RequiresOptIn'
6868

Jetchat/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@ subprojects {
6161

6262
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
6363
kotlinOptions {
64-
// Treat all Kotlin warnings as errors
65-
allWarningsAsErrors = true
64+
// Treat all Kotlin warnings as errors (disabled by default)
65+
allWarningsAsErrors = project.hasProperty("warningsAsErrors") ? project.warningsAsErrors : false
6666

6767
freeCompilerArgs += '-Xopt-in=kotlin.RequiresOptIn'
6868

Jetsnack/build.gradle

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,15 @@ subprojects {
4747

4848
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
4949
kotlinOptions {
50-
jvmTarget = '1.8'
51-
allWarningsAsErrors = true
52-
// Opt-in to experimental compose APIs
50+
// Treat all Kotlin warnings as errors (disabled by default)
51+
allWarningsAsErrors = project.hasProperty("warningsAsErrors") ? project.warningsAsErrors : false
52+
5353
freeCompilerArgs += '-Xopt-in=kotlin.RequiresOptIn'
54-
// Enable experimental coroutines APIs, including collectAsState()
55-
freeCompilerArgs += '-Xopt-in=kotlinx.coroutines.ExperimentalCoroutinesApi'
54+
// Enable experimental coroutines APIs, including Flow
55+
freeCompilerArgs += '-Xopt-in=kotlin.Experimental'
56+
57+
// Set JVM target to 1.8
58+
jvmTarget = "1.8"
5659
}
5760
}
5861

Jetsurvey/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ subprojects {
5959

6060
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
6161
kotlinOptions {
62-
// Treat all Kotlin warnings as errors
63-
allWarningsAsErrors = true
62+
// Treat all Kotlin warnings as errors (disabled by default)
63+
allWarningsAsErrors = project.hasProperty("warningsAsErrors") ? project.warningsAsErrors : false
6464

6565
freeCompilerArgs += '-Xopt-in=kotlin.RequiresOptIn'
6666

Owl/build.gradle

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,12 @@ subprojects {
4747

4848
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
4949
kotlinOptions {
50-
jvmTarget = '1.8'
51-
allWarningsAsErrors = true
50+
// Treat all Kotlin warnings as errors (disabled by default)
51+
allWarningsAsErrors = project.hasProperty("warningsAsErrors") ? project.warningsAsErrors : false
5252
// Opt-in to experimental compose APIs
5353
freeCompilerArgs += '-Xopt-in=kotlin.RequiresOptIn'
54+
55+
jvmTarget = '1.8'
5456
}
5557
}
5658

0 commit comments

Comments
 (0)