Cleanup and fix CI tests (#1464)

1 files changed, 15 insertions, 4 deletions

diff --git a/buildSrc/src/main/java/BaseProjectConfig.kt b/buildSrc/src/main/java/BaseProjectConfig.kt
index a829d4f7..e4dfa7e4 100644
--- a/buildSrc/src/main/java/BaseProjectConfig.kt
+++ b/buildSrc/src/main/java/BaseProjectConfig.kt
@@ -13,6 +13,7 @@ import org.gradle.api.tasks.wrapper.Wrapper
 import org.gradle.kotlin.dsl.maven
 import org.gradle.kotlin.dsl.repositories
 import org.gradle.kotlin.dsl.withType
+import org.gradle.language.nativeplatform.internal.BuildType
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 /**
@@ -50,9 +51,10 @@ internal fun Project.configureForAllProjects() {
       languageVersion = "1.5"
     }
   }
-  tasks.withType<Test> {
+  tasks.withType<Test>().configureEach {
     maxParallelForks = Runtime.getRuntime().availableProcessors() * 2
     testLogging { events(TestLogEvent.PASSED, TestLogEvent.SKIPPED, TestLogEvent.FAILED) }
+    outputs.upToDateWhen { false }
   }
 }
 
@@ -79,13 +81,19 @@ internal fun BaseAppModuleExtension.configureAndroidApplicationOptions(project:
     buildConfig = true
   }
 
+  flavorDimensions(FlavorDimensions.FREE)
+  productFlavors {
+    create(ProductFlavors.FREE) {}
+    create(ProductFlavors.NON_FREE) {}
+  }
+
   buildTypes {
-    named("release") {
+    named(BuildType.RELEASE.name) {
       isMinifyEnabled = !minifySwitch.isPresent
       setProguardFiles(listOf("proguard-android-optimize.txt", "proguard-rules.pro"))
       buildConfigField("boolean", "ENABLE_DEBUG_FEATURES", "${project.isSnapshot()}")
     }
-    named("debug") {
+    named(BuildType.DEBUG.name) {
       applicationIdSuffix = ".debug"
       versionNameSuffix = "-debug"
       isMinifyEnabled = false
@@ -121,5 +129,8 @@ internal fun TestedExtension.configureCommonAndroidOptions() {
     targetCompatibility = JavaVersion.VERSION_1_8
   }
 
-  testOptions.animationsDisabled = true
+  testOptions {
+    animationsDisabled = true
+    unitTests.isReturnDefaultValues = true
+  }
 }