[All] Restricts allWarningsAsErrors in all projects + cleanup

bentrengrove · Jun 29, 2021 · bd9cf1b · bd9cf1b
1 parent 91ab305
commit bd9cf1b
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 20 deletions.
diff --git a/Crane/build.gradle b/Crane/build.gradle
@@ -60,8 +60,8 @@ subprojects {
 
     tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
         kotlinOptions {
-            // Treat all Kotlin warnings as errors
-            allWarningsAsErrors = true
+            // Treat all Kotlin warnings as errors (disabled by default)
+            allWarningsAsErrors = project.hasProperty("warningsAsErrors") ? project.warningsAsErrors : false
 
             jvmTarget = "1.8"
 

diff --git a/JetNews/app/build.gradle b/JetNews/app/build.gradle
@@ -57,11 +57,6 @@ android {
         targetCompatibility JavaVersion.VERSION_1_8
     }
 
-    kotlinOptions {
-        jvmTarget = '1.8'
-        allWarningsAsErrors = true
-    }
-
     buildFeatures {
         compose true
     }

diff --git a/Jetcaster/build.gradle b/Jetcaster/build.gradle
@@ -61,8 +61,8 @@ subprojects {
 
     tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
         kotlinOptions {
-            // Treat all Kotlin warnings as errors
-            allWarningsAsErrors = true
+            // Treat all Kotlin warnings as errors (disabled by default)
+            allWarningsAsErrors = project.hasProperty("warningsAsErrors") ? project.warningsAsErrors : false
 
             freeCompilerArgs += '-Xopt-in=kotlin.RequiresOptIn'
 

diff --git a/Jetchat/build.gradle b/Jetchat/build.gradle
@@ -61,8 +61,8 @@ subprojects {
 
     tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
         kotlinOptions {
-            // Treat all Kotlin warnings as errors
-            allWarningsAsErrors = true
+            // Treat all Kotlin warnings as errors (disabled by default)
+            allWarningsAsErrors = project.hasProperty("warningsAsErrors") ? project.warningsAsErrors : false
 
             freeCompilerArgs += '-Xopt-in=kotlin.RequiresOptIn'
 

diff --git a/Jetsnack/build.gradle b/Jetsnack/build.gradle
@@ -47,12 +47,15 @@ subprojects {
 
     tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
         kotlinOptions {
-            jvmTarget = '1.8'
-            allWarningsAsErrors = true
-            // Opt-in to experimental compose APIs
+            // Treat all Kotlin warnings as errors (disabled by default)
+            allWarningsAsErrors = project.hasProperty("warningsAsErrors") ? project.warningsAsErrors : false
+
             freeCompilerArgs += '-Xopt-in=kotlin.RequiresOptIn'
-            // Enable experimental coroutines APIs, including collectAsState()
-            freeCompilerArgs += '-Xopt-in=kotlinx.coroutines.ExperimentalCoroutinesApi'
+            // Enable experimental coroutines APIs, including Flow
+            freeCompilerArgs += '-Xopt-in=kotlin.Experimental'
+
+            // Set JVM target to 1.8
+            jvmTarget = "1.8"
         }
     }
 

diff --git a/Jetsurvey/build.gradle b/Jetsurvey/build.gradle
@@ -59,8 +59,8 @@ subprojects {
 
     tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
         kotlinOptions {
-            // Treat all Kotlin warnings as errors
-            allWarningsAsErrors = true
+            // Treat all Kotlin warnings as errors (disabled by default)
+            allWarningsAsErrors = project.hasProperty("warningsAsErrors") ? project.warningsAsErrors : false
 
             freeCompilerArgs += '-Xopt-in=kotlin.RequiresOptIn'
 

diff --git a/Owl/build.gradle b/Owl/build.gradle
@@ -47,10 +47,12 @@ subprojects {
 
     tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
         kotlinOptions {
-            jvmTarget = '1.8'
-            allWarningsAsErrors = true
+            // Treat all Kotlin warnings as errors (disabled by default)
+            allWarningsAsErrors = project.hasProperty("warningsAsErrors") ? project.warningsAsErrors : false
             // Opt-in to experimental compose APIs
             freeCompilerArgs += '-Xopt-in=kotlin.RequiresOptIn'
+
+            jvmTarget = '1.8'
         }
     }