Set warnings as errors for compiler and android lint

russhwolf · Jul 28, 2020 · b7ccd16 · b7ccd16
1 parent badd975
commit b7ccd16
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 10 deletions.
diff --git a/buildSrc/src/main/kotlin/BuildHelpers.kt b/buildSrc/src/main/kotlin/BuildHelpers.kt
@@ -83,6 +83,11 @@ private fun KotlinMultiplatformExtension.buildAllTargets(targetPresets: NamedDom
             useExperimentalAnnotation("kotlin.RequiresOptIn")
         }
     }
+    targets.configureEach {
+        it.compilations.configureEach {
+            it.kotlinOptions.allWarningsAsErrors = true
+        }
+    }
 
     linkNativeSourceSets()
 }
@@ -163,6 +168,10 @@ private fun BaseExtension.configureAndroidApiLevel() {
     defaultConfig.apply {
         minSdkVersion(15)
     }
+    lintOptions.apply {
+        isAbortOnError = true
+        isWarningsAsErrors = true
+    }
 }
 
 private fun Project.configureTests() {

diff --git a/multiplatform-settings-no-arg/build.gradle.kts b/multiplatform-settings-no-arg/build.gradle.kts
@@ -67,10 +67,10 @@ kotlin {
             dependencies {
                 implementation(kotlin("test"))
                 implementation(kotlin("test-junit"))
-                implementation("junit:junit:4.12")
+                implementation("junit:junit:4.13")
                 implementation("androidx.test:core:1.2.0")
                 implementation("androidx.test.ext:junit:1.1.1")
-                implementation("org.robolectric:robolectric:4.3")
+                implementation("org.robolectric:robolectric:4.3.1")
 
                 implementation("androidx.preference:preference:1.1.1")
             }
@@ -82,10 +82,11 @@ kotlin {
             }
         }
         val jvmTest by getting {
+            languageSettings.useExperimentalAnnotation("com.russhwolf.settings.ExperimentalJvm")
             dependencies {
                 implementation(kotlin("test"))
                 implementation(kotlin("test-junit"))
-                implementation("junit:junit:4.12")
+                implementation("junit:junit:4.13")
             }
         }
 

diff --git a/multiplatform-settings-test/build.gradle.kts b/multiplatform-settings-test/build.gradle.kts
@@ -53,7 +53,7 @@ kotlin {
             dependencies {
                 implementation(kotlin("test"))
                 implementation(kotlin("test-junit"))
-                implementation("junit:junit:4.12")
+                implementation("junit:junit:4.13")
             }
         }
 
@@ -66,7 +66,7 @@ kotlin {
             dependencies {
                 implementation(kotlin("test"))
                 implementation(kotlin("test-junit"))
-                implementation("junit:junit:4.12")
+                implementation("junit:junit:4.13")
             }
         }
 

diff --git a/multiplatform-settings/build.gradle.kts b/multiplatform-settings/build.gradle.kts
@@ -51,10 +51,10 @@ kotlin {
             dependencies {
                 implementation(kotlin("test"))
                 implementation(kotlin("test-junit"))
-                implementation("junit:junit:4.12")
+                implementation("junit:junit:4.13")
                 implementation("androidx.test:core:1.2.0")
                 implementation("androidx.test.ext:junit:1.1.1")
-                implementation("org.robolectric:robolectric:4.3")
+                implementation("org.robolectric:robolectric:4.3.1")
             }
         }
 
@@ -67,7 +67,7 @@ kotlin {
             dependencies {
                 implementation(kotlin("test"))
                 implementation(kotlin("test-junit"))
-                implementation("junit:junit:4.12")
+                implementation("junit:junit:4.13")
             }
         }
 

diff --git a/multiplatform-settings/src/appleMain/kotlin/com/russhwolf/settings/AppleSettings.kt b/multiplatform-settings/src/appleMain/kotlin/com/russhwolf/settings/AppleSettings.kt
@@ -84,6 +84,7 @@ public class AppleSettings public constructor(
         }
     }
 
+    @Suppress("UNCHECKED_CAST")
     public override val keys: Set<String> get() = delegate.dictionaryRepresentation().keys as Set<String>
     public override val size: Int get() = delegate.dictionaryRepresentation().keys.count()
 

diff --git a/multiplatform-settings/src/jvmMain/kotlin/com/russhwolf/settings/JvmSettings.kt b/multiplatform-settings/src/jvmMain/kotlin/com/russhwolf/settings/JvmSettings.kt
@@ -61,6 +61,7 @@ public class JvmPropertiesSettings public constructor(
     private val onModify: (Properties) -> Unit = {}
 ) : Settings {
 
+    @Suppress("UNCHECKED_CAST")
     public override val keys: Set<String> get() = delegate.propertyNames().toList().toSet() as Set<String>
     public override val size: Int get() = delegate.size
 

diff --git a/tests/build.gradle.kts b/tests/build.gradle.kts
@@ -42,7 +42,7 @@ kotlin {
 
                 implementation(kotlin("test"))
                 implementation(kotlin("test-junit"))
-                implementation("junit:junit:4.12")
+                implementation("junit:junit:4.13")
             }
         }
 
@@ -52,7 +52,7 @@ kotlin {
 
                 implementation(kotlin("test"))
                 implementation(kotlin("test-junit"))
-                implementation("junit:junit:4.12")
+                implementation("junit:junit:4.13")
             }
         }
-Original file line number
+Diff line change
@@ Expand Up / @@ -84,6 +84,7 @@ public class AppleSettings public constructor( @@
             }
         }
+        @Suppress("UNCHECKED_CAST")
         public override val keys: Set<String> get() = delegate.dictionaryRepresentation().keys as Set<String>
         public override val size: Int get() = delegate.dictionaryRepresentation().keys.count()
@@ Expand Down @@