Upgrade Kotlin & related libraries to 2.1.0

ast/build.gradle

@@ -3,10 +3,6 @@ plugins {
     id 'com.vanniktech.maven.publish'
 }
 
-kotlin {
-    jvmToolchain(11)
-}
-
 dependencies {
     implementation deps.kotlin.stdlib
     implementation deps.dagger

ast/src/main/kotlin/motif/ast/IrAnnotated.kt

@@ -21,11 +21,8 @@ interface IrAnnotated {
 
   val annotations: List<IrAnnotation>
 
-  fun hasAnnotation(annotationClass: KClass<out Annotation>): Boolean {
-    return annotations.any { it.matchesClass(annotationClass) }
-  }
+  fun hasAnnotation(annotationClass: KClass<out Annotation>): Boolean =
+      annotations.any { it.matchesClass(annotationClass) }
 
-  fun isNullable(): Boolean {
-    return annotations.any { it.className?.endsWith("Nullable") == true }
-  }
+  fun isNullable(): Boolean = annotations.any { it.className?.endsWith("Nullable") == true }
 }

ast/src/main/kotlin/motif/ast/IrClass.kt

@@ -34,16 +34,13 @@ interface IrClass : IrAnnotated, IrHasModifiers {
   val simpleName: String
     get() = type.simpleName
 
-  fun hasNonDefaultConstructor(): Boolean {
-    return constructors.any { it.hasParameters() }
-  }
+  fun hasNonDefaultConstructor(): Boolean = constructors.any { it.hasParameters() }
 
-  fun annotatedInnerClass(annotationClass: KClass<out Annotation>): IrClass? {
-    return nestedClasses.find { it.hasAnnotation(annotationClass) }
-  }
+  fun annotatedInnerClass(annotationClass: KClass<out Annotation>): IrClass? =
+      nestedClasses.find { it.hasAnnotation(annotationClass) }
 
   enum class Kind {
     CLASS,
-    INTERFACE
+    INTERFACE,
   }
 }

ast/src/main/kotlin/motif/ast/IrHasModifiers.kt

@@ -19,19 +19,11 @@ interface IrHasModifiers {
 
   val modifiers: Set<IrModifier>
 
-  fun isStatic(): Boolean {
-    return IrModifier.STATIC in modifiers
-  }
+  fun isStatic(): Boolean = IrModifier.STATIC in modifiers
 
-  fun isPrivate(): Boolean {
-    return IrModifier.PRIVATE in modifiers
-  }
+  fun isPrivate(): Boolean = IrModifier.PRIVATE in modifiers
 
-  fun isPublic(): Boolean {
-    return IrModifier.PUBLIC in modifiers
-  }
+  fun isPublic(): Boolean = IrModifier.PUBLIC in modifiers
 
-  fun isAbstract(): Boolean {
-    return IrModifier.ABSTRACT in modifiers
-  }
+  fun isAbstract(): Boolean = IrModifier.ABSTRACT in modifiers
 }

ast/src/main/kotlin/motif/ast/IrMethod.kt

@@ -21,11 +21,7 @@ interface IrMethod : IrAnnotated, IrHasModifiers {
   val name: String
   val isConstructor: Boolean
 
-  fun hasParameters(): Boolean {
-    return parameters.isNotEmpty()
-  }
+  fun hasParameters(): Boolean = parameters.isNotEmpty()
 
-  fun isVoid(): Boolean {
-    return returnType.isVoid
-  }
+  fun isVoid(): Boolean = returnType.isVoid
 }

ast/src/main/kotlin/motif/ast/IrModifier.kt

@@ -30,5 +30,5 @@ enum class IrModifier {
   VOLATILE,
   DEFAULT,
   OPEN,
-  TRANSITIVE
+  TRANSITIVE,
 }

ast/src/main/kotlin/motif/ast/IrType.kt

@@ -25,6 +25,7 @@ interface IrType : IrEquivalence {
     get() = simpleName(qualifiedName)
 
   fun resolveClass(): IrClass?
+
   fun isAssignableTo(type: IrType): Boolean
 }
 

ast/src/test/kotlin/motif/ast/SimpleNameTest.kt

@@ -33,13 +33,12 @@ class SimpleNameTest(private val qualifiedName: String, private val expectedSimp
             "java.util.List<? super java.lang.String>" to "List<? super String>",
             "java.util.Map<java.lang.String, java.lang.Integer>" to "Map<String, Integer>",
             "java.util.Map<? extends java.lang.String, ? super java.lang.Integer>" to
-                "Map<? extends String, ? super Integer>")
+                "Map<? extends String, ? super Integer>",
+        )
 
     @JvmStatic
     @Parameterized.Parameters(name = "{0}")
-    fun data(): Collection<Array<Any>> {
-      return tests.map { (key, value) -> arrayOf(key, value) }
-    }
+    fun data(): Collection<Array<Any>> = tests.map { (key, value) -> arrayOf(key, value) }
   }
 
   @Test

build.gradle

@@ -13,6 +13,7 @@ buildscript {
     }
     dependencies {
         classpath deps.build.gradlePlugins.android
+        classpath deps.build.gradlePlugins.intellij
         classpath deps.build.gradlePlugins.kotlin
         classpath deps.build.gradlePlugins.ksp
         classpath deps.build.gradlePlugins.dokka
@@ -64,12 +65,37 @@ subprojects {
         }
         boolean isKotlinLibrary = project.plugins.hasPlugin("org.jetbrains.kotlin.jvm") || project.plugins.hasPlugin("org.jetbrains.kotlin.android")
         if (isKotlinLibrary) {
+            java {
+                toolchain.languageVersion.set(JavaLanguageVersion.of(11))
+            }
+            kotlin {
+                jvmToolchain(11)
+            }
             it.tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
                 kotlinOptions {
                     freeCompilerArgs += extraKotlincArgs
                 }
             }
         }
+
+        boolean isAndroidLibraryOrApp = project.plugins.hasPlugin("org.jetbrains.kotlin.android")
+        if (isAndroidLibraryOrApp) {
+            android {
+                compileOptions {
+                    sourceCompatibility JavaVersion.VERSION_1_8
+                    targetCompatibility JavaVersion.VERSION_1_8
+                }
+
+            }
+        }
+
+        if (isKotlinLibrary && isAndroidLibraryOrApp) {
+            android {
+                kotlinOptions {
+                    jvmTarget = "1.8"
+                }
+            }
+        }
     }
 
     if (project.path != ":tests") {
@@ -83,7 +109,14 @@ subprojects {
             }
             kotlin {
                 target "src/**/*.kt"
-                ktlint(deps.versions.ktlint).userData(['indent_size': '2', 'continuation_indent_size': '2'])
+                ktlint(deps.versions.ktlint).editorConfigOverride([
+                        "indent_size": "2",
+                        "continuation_indent_size": "4"
+                ])
+                suppressLintsFor {
+                    step = 'ktlint'
+                    shortCode = 'standard:function-naming'
+                }
                 ktfmt(deps.versions.ktfmt)
                 licenseHeaderFile rootProject.file('config/spotless/copyright.kt')
                 trimTrailingWhitespace()

compiler/ast/build.gradle

@@ -3,10 +3,6 @@ plugins {
     id 'com.vanniktech.maven.publish'
 }
 
-kotlin {
-    jvmToolchain(11)
-}
-
 dependencies {
     implementation deps.kotlin.stdlib
     implementation deps.autoCommon

compiler/ast/src/main/kotlin/com/uber/xprocessing/ext/XAnnotation.kt

@@ -28,25 +28,23 @@ import com.google.auto.common.AnnotationMirrors
  * Used to find equivalence of two XAnnotation since AnnotationMirrors.equivalence() only applies to
  * the Javac backend.
  */
-fun XAnnotation.isEquivalent(other: XAnnotation, env: XProcessingEnv): Boolean {
-  return if (env.backend == XProcessingEnv.Backend.JAVAC) {
-    val key = AnnotationMirrors.equivalence().wrap(this.toJavac())
-    val otherKey = AnnotationMirrors.equivalence().wrap(other.toJavac())
-    key == otherKey
-  } else {
-    (type.isEquivalent(other.type, env) &&
-        annotationValues.size == other.annotationValues.size &&
-        annotationValues.zip(other.annotationValues).all { (lhs, rhs) -> lhs.isEquivalent(rhs) })
-  }
-}
+fun XAnnotation.isEquivalent(other: XAnnotation, env: XProcessingEnv): Boolean =
+    if (env.backend == XProcessingEnv.Backend.JAVAC) {
+      val key = AnnotationMirrors.equivalence().wrap(this.toJavac())
+      val otherKey = AnnotationMirrors.equivalence().wrap(other.toJavac())
+      key == otherKey
+    } else {
+      (type.isEquivalent(other.type, env) &&
+          annotationValues.size == other.annotationValues.size &&
+          annotationValues.zip(other.annotationValues).all { (lhs, rhs) -> lhs.isEquivalent(rhs) })
+    }
 
 /**
  * Used to find equivalence of two XAnnotation since AnnotationMirrors.equivalence() only applies to
  * the Javac backend.
  */
-fun XAnnotationValue.isEquivalent(other: XAnnotationValue): Boolean {
-  return this.name == other.name && this.value == other.value
-}
+fun XAnnotationValue.isEquivalent(other: XAnnotationValue): Boolean =
+    this.name == other.name && this.value == other.value
 
 /** Cleans up differences in the toString() methods between the JAVAC and KSP backends. */
 fun XAnnotation.toPrettyString(): String {
@@ -55,7 +53,9 @@ fun XAnnotation.toPrettyString(): String {
           .map {
             if (it.name == "value") {
               "\"${it.value}\""
-            } else "${it.name} = ${it.value}"
+            } else {
+              "${it.name} = ${it.value}"
+            }
           }
           .joinToString(", ")
   val annotationValuesList =

compiler/ast/src/main/kotlin/com/uber/xprocessing/ext/XElement.kt

@@ -33,13 +33,10 @@ val XElement.modifiers: List<Modifier>
       if (isFinal()) modifiers += Modifier.FINAL
       if (isTransient()) modifiers += Modifier.TRANSIENT
       return@let modifiers
-    }
-        ?: emptyList()
+    } ?: emptyList()
   }
 
 val XElement.modifierNames: List<String>
   get() = modifiers.map { it.name }
 
-fun XHasModifiers.isPackagePrivate(): Boolean {
-  return !isPrivate() && !isProtected() && !isPublic()
-}
+fun XHasModifiers.isPackagePrivate(): Boolean = !isPrivate() && !isProtected() && !isPublic()

compiler/ast/src/main/kotlin/com/uber/xprocessing/ext/XOverrides.kt

@@ -44,7 +44,11 @@ object XOverrides {
       return when (env.backend) {
         XProcessingEnv.Backend.JAVAC -> {
           MoreElements.overrides(
-              overrider.toJavac(), overridden.toJavac(), inType.toJavac(), env.toJavac().typeUtils)
+              overrider.toJavac(),
+              overridden.toJavac(),
+              inType.toJavac(),
+              env.toJavac().typeUtils,
+          )
           false
         }
         XProcessingEnv.Backend.KSP -> {
@@ -141,7 +145,8 @@ enum class Visibility {
   DEFAULT,
   PROTECTED,
   INTERNAL,
-  PUBLIC;
+  PUBLIC,
+  ;
 
   companion object {
     fun of(element: XMethodElement) =

compiler/ast/src/main/kotlin/com/uber/xprocessing/ext/XProcessingEnv.kt

@@ -25,14 +25,12 @@ val XProcessingEnv.typeUtils
   get() = XTypeUtils
 
 /** Provides access to KSP's resolver since XProcessing does not give us access */
-fun XProcessingEnv.resolver(): Resolver? {
-  return if (backend == XProcessingEnv.Backend.KSP) {
-    Class.forName("androidx.room.compiler.processing.ksp.KspProcessingEnv")
-        ?.getDeclaredField("_resolver")
-        ?.apply { isAccessible = true }
-        ?.get(this) as
-        Resolver?
-  } else {
-    null
-  }
-}
+fun XProcessingEnv.resolver(): Resolver? =
+    if (backend == XProcessingEnv.Backend.KSP) {
+      Class.forName("androidx.room.compiler.processing.ksp.KspProcessingEnv")
+          ?.getDeclaredField("_resolver")
+          ?.apply { isAccessible = true }
+          ?.get(this) as Resolver?
+    } else {
+      null
+    }