Update to Kotlin 1.5 (#210)

* Update to Kotlin 1.5

* Fix jacoco merge task

Author: Laimiux

build.gradle

@@ -3,7 +3,7 @@ apply plugin: "com.github.ben-manes.versions"
 
 buildscript {
     ext {
-        kotlinVersion = '1.4.32'
+        kotlinVersion = '1.5.10'
 
         versions = [:]
         libraries = [:]
@@ -22,10 +22,9 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.3'
+        classpath 'com.android.tools.build:gradle:4.2.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
         classpath "com.vanniktech:gradle-android-junit-jacoco-plugin:0.16.0"
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
         classpath "com.github.ben-manes:gradle-versions-plugin:0.28.0"
         classpath "org.jetbrains.dokka:dokka-gradle-plugin:0.9.18"
         classpath "org.jetbrains.dokka:dokka-android-gradle-plugin:0.9.18"

formula-android/build.gradle

@@ -1,5 +1,4 @@
 apply plugin: 'com.android.library'
-apply plugin: 'com.github.dcendents.android-maven'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
 apply plugin: "com.github.ben-manes.versions"

gradle/merge-reports.gradle

@@ -1,15 +1,32 @@
+subprojects { project ->
+    if (!project.name.contains("formula")) {
+        return
+    }
+
+    project.plugins.withId("com.android.application") {
+        disableHtmlTestReport(project)
+    }
+
+    project.plugins.withId("com.android.library") {
+        disableHtmlTestReport(project)
+    }
+}
+
 // make sure this project depends on the evaluation of all sub projects so that
 // it's evaluated last.
 project.evaluationDependsOnChildren()
 
 afterEvaluate {
+
     def testTasks = subprojects.findAll { it.name.contains("formula") }.collect { it.tasks.withType(Test) }.flatten()
     if (testTasks.isEmpty()) {
         throw IllegalStateException("misconfiguration: no test tasks found")
     }
 
     task mergeReports(type: Copy) {
-        from { testTasks*.reports.junitXml.destination }
+        from { testTasks*.reports.junitXml.destination } {
+            exclude("**/binary/*")
+        }
         into { file("$buildDir/reports/allTests") }
 
         doLast {
@@ -18,20 +35,12 @@ afterEvaluate {
     }
 }
 
-subprojects {
-    if (!name.contains("formula")) {
-        return
-    }
-
-    afterEvaluate {
-        if (plugins.hasPlugin("com.android.application") || plugins.hasPlugin("com.android.library")) {
-            android {
-                testOptions {
-                    unitTests.all {
-                        reports.html.enabled = false
-                    }
-                }
+def disableHtmlTestReport(Project project) {
+    project.android {
+        testOptions {
+            unitTests.all {
+                reports.html.enabled = false
             }
         }
     }
-}
+}

gradle/wrapper/gradle-wrapper.jar

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -82,6 +82,7 @@ esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -129,6 +130,7 @@ fi
 if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath

gradlew

@@ -29,6 +29,9 @@ if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
@@ -37,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -51,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -61,28 +64,14 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell

gradlew.bat

@@ -2,39 +2,6 @@ apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: "kotlin-parcelize"
 
-// Create a configuration which allows us to intercept the JARs, and add them to
-// Kotlin Compiler freeCompilerArgs. This is needed because we can't currently use the
-// built-in `compose` feature in AGP, since it depends on the old Compose Compiler artifacts.
-// TODO: Remove this once AGP uses the new Compose Compiler artifact name
-def compilerPluginConfig = project.configurations.create("kotlinCompilerPlugin")
-tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach { compile ->
-    kotlinOptions {
-        // Treat all Kotlin warnings as errors
-        allWarningsAsErrors = true
-
-        // Set JVM target to 1.8
-        jvmTarget = "1.8"
-
-        // Allow use of @OptIn
-        freeCompilerArgs += "-Xopt-in=kotlin.RequiresOptIn"
-
-        freeCompilerArgs += "-Xallow-jvm-ir-dependencies"
-        // Turn on JVM default methods
-        freeCompilerArgs += "-Xjvm-default=all"
-    }
-
-    compile.dependsOn(compilerPluginConfig)
-    compile.doFirst {
-        if (!compilerPluginConfig.isEmpty()) {
-            // Add the compiler plugin JARs using the -Xplugin flag
-            compile.kotlinOptions.freeCompilerArgs +=
-                    "-Xplugin=${compilerPluginConfig.files.first()}"
-            // Need to turn on the IR compiler too
-            compile.kotlinOptions.useIR = true
-        }
-    }
-}
-
 android {
     compileSdkVersion constants.compileSdk
 
@@ -48,13 +15,7 @@ android {
     }
 
     buildFeatures {
-        // We turn off the Compose feature for now, due to using Compose SNAPSHOTs where the
-        // Compose compiler artifact has changed artifact group/name.
-        // Instead we add the compiler manually below in the dependencies {}. Also see
-        // the root build.gradle for info on how to apply the plugin.
-        // TODO: remove this once we upgrade to an AGP version which uses the new artifact details
-
-//         compose true
+         compose true
     }
 
     // Set both the Java and Kotlin compilers to target Java 8.
@@ -69,8 +30,8 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerVersion "1.4.32"
-        kotlinCompilerExtensionVersion "1.0.0-beta04"
+        kotlinCompilerVersion "1.5.10"
+        kotlinCompilerExtensionVersion "1.0.0-beta08"
     }
 
     buildTypes {
@@ -95,9 +56,7 @@ dependencies {
     implementation libraries.rxrelays
     implementation libraries.rxandroid
 
-    def composeVersion = "1.0.0-beta04"
-    // Temporary workaround (see above)
-    kotlinCompilerPlugin "androidx.compose.compiler:compiler:$composeVersion"
+    def composeVersion = "1.0.0-beta08"
 
     // You also need to include the following Compose toolkit dependencies.
     implementation "androidx.compose.ui:ui:$composeVersion"