From bd9cf1b645b89b52f14366100f791684f2f57c94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jose=20Alc=C3=A9rreca?= <jalc@google.com>
Date: Tue, 29 Jun 2021 10:47:23 +0000
Subject: [PATCH] [All] Restricts allWarningsAsErrors in all projects + cleanup

---
 Crane/build.gradle       |  4 ++--
 JetNews/app/build.gradle |  5 -----
 Jetcaster/build.gradle   |  4 ++--
 Jetchat/build.gradle     |  4 ++--
 Jetsnack/build.gradle    | 13 ++++++++-----
 Jetsurvey/build.gradle   |  4 ++--
 Owl/build.gradle         |  6 ++++--
 7 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/Crane/build.gradle b/Crane/build.gradle
index ff0ac1daea..50a1435724 100644
--- 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
index 91e81d0d8d..a1899958bb 100644
--- 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
index c1aa8ce904..910e8e696e 100644
--- 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
index 2103437db8..0359bb44dc 100644
--- 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
index c464fce572..a6ceae2a06 100644
--- 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
index 4eb4263d9e..576e2ecc70 100644
--- 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
index d6cc3b54fd..b494e68365 100644
--- 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'
         }
     }