Updated libs

IVIanuu · Aug 26, 2024 · 3768f89 · 3768f89
1 parent e4f201e
commit 3768f89
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 33 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -2,8 +2,7 @@
  * Copyright 2022 Manuel Wrage. Use of this source code is governed by the Apache 2.0 license.
  */
 
-import com.vanniktech.maven.publish.MavenPublishBaseExtension
-import com.vanniktech.maven.publish.SonatypeHost
+import com.vanniktech.maven.publish.*
 
 buildscript {
   repositories {

diff --git a/buildSrc/src/main/kotlin/dependencies.kt b/buildSrc/src/main/kotlin/dependencies.kt
@@ -16,9 +16,9 @@ object Build {
 object Deps {
   const val androidGradlePlugin = "com.android.tools.build:gradle:8.2.2"
 
-  const val androidxActivityCompose = "androidx.activity:activity-compose:1.5.1"
+  const val androidxActivityCompose = "androidx.activity:activity-compose:1.9.1"
 
-  const val atomicFuGradlePlugin = "org.jetbrains.kotlinx:atomicfu-gradle-plugin:0.23.2"
+  const val atomicFuGradlePlugin = "org.jetbrains.kotlinx:atomicfu-gradle-plugin:0.25.0"
 
   object AutoService {
     private const val version = "1.1.0"
@@ -27,14 +27,14 @@ object Deps {
   }
 
   object Compose {
-    const val version = "1.6.10"
+    const val version = "1.6.11"
     const val gradlePlugin = "org.jetbrains.kotlin:kotlin-compose-compiler-plugin-embeddable:${Kotlin.version}"
     const val material = "org.jetbrains.compose.material:material:$version"
     const val runtime = "org.jetbrains.compose.runtime:runtime:$version"
   }
 
   object Coroutines {
-    private const val version = "1.8.1"
+    private const val version = "1.9.0-RC.2"
     const val android = "org.jetbrains.kotlinx:kotlinx-coroutines-android:$version"
     const val test = "org.jetbrains.kotlinx:kotlinx-coroutines-test:$version"
   }
@@ -49,27 +49,27 @@ object Deps {
   const val junit = "junit:junit:4.12"
 
   object Kotlin {
-    const val version = "2.0.0"
+    const val version = "2.0.20"
     const val compilerEmbeddable = "org.jetbrains.kotlin:kotlin-compiler-embeddable:$version"
     const val gradlePlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:$version"
     const val gradlePluginApi = "org.jetbrains.kotlin:kotlin-gradle-plugin-api:$version"
   }
 
   object KotlinCompileTesting {
-    private const val version = "0.5.0-alpha07"
+    private const val version = "0.5.1"
     const val core = "dev.zacsweers.kctfork:core:$version"
     const val ksp = "dev.zacsweers.kctfork:ksp:$version"
   }
 
   object KotlinSerialization {
     const val gradlePlugin = "org.jetbrains.kotlin:kotlin-serialization:${Kotlin.version}"
-    const val json = "org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.0-RC"
+    const val json = "org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.1"
   }
 
-  const val kotestAssertions = "io.kotest:kotest-assertions-core:4.4.3"
+  const val kotestAssertions = "io.kotest:kotest-assertions-core:5.9.1"
 
   object Ksp {
-    const val version = "2.0.0-1.0.21"
+    const val version = "2.0.20-1.0.24"
     const val api = "com.google.devtools.ksp:symbol-processing-api:$version"
     const val gradlePlugin = "com.google.devtools.ksp:symbol-processing-gradle-plugin:$version"
     const val symbolProcessing = "com.google.devtools.ksp:symbol-processing:$version"

diff --git a/common/build.gradle.kts b/common/build.gradle.kts
@@ -6,7 +6,7 @@ import org.jetbrains.kotlin.gradle.tasks.*
 
 plugins {
   kotlin("multiplatform")
-  id("kotlinx-atomicfu")
+  id("org.jetbrains.kotlinx.atomicfu")
   id("com.ivianuu.injekt")
 }
 

diff --git a/compiler/src/main/kotlin/com/ivianuu/injekt/compiler/InjektPlugin.kt b/compiler/src/main/kotlin/com/ivianuu/injekt/compiler/InjektPlugin.kt
@@ -8,19 +8,12 @@ import com.google.auto.service.*
 import com.ivianuu.injekt.compiler.fir.*
 import com.ivianuu.injekt.compiler.ir.*
 import org.jetbrains.kotlin.backend.common.extensions.*
-import org.jetbrains.kotlin.cli.common.*
 import org.jetbrains.kotlin.com.intellij.mock.*
 import org.jetbrains.kotlin.com.intellij.openapi.extensions.*
 import org.jetbrains.kotlin.compiler.plugin.*
 import org.jetbrains.kotlin.config.*
-import org.jetbrains.kotlin.extensions.*
 import org.jetbrains.kotlin.fir.extensions.*
-import org.jetbrains.kotlin.resolve.diagnostics.*
-import org.jetbrains.kotlin.resolve.extensions.*
-import org.jetbrains.kotlin.synthetic.*
-import org.jetbrains.kotlin.utils.addToStdlib.*
 import java.io.*
-import java.util.*
 
 @OptIn(ExperimentalCompilerApi::class)
 @AutoService(ComponentRegistrar::class)

diff --git a/compiler/src/main/kotlin/com/ivianuu/injekt/compiler/fir/Infos.kt b/compiler/src/main/kotlin/com/ivianuu/injekt/compiler/fir/Infos.kt
@@ -200,8 +200,9 @@ private inline fun <reified T> FirBasedSymbol<*>.decodeDeclarationInfo(ctx: Inje
     ?.mapping
     ?.values
     ?.singleOrNull()
-    ?.safeAs<FirLiteralExpression<String>>()
+    ?.safeAs<FirLiteralExpression>()
     ?.value
+    ?.safeAs<String>()
     ?.decode<T>()
 
 @Serializable data class PersistedInjektType(

diff --git a/core/build.gradle.kts b/core/build.gradle.kts
@@ -1,4 +1,4 @@
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+import org.jetbrains.kotlin.gradle.tasks.*
 
 /*
  * Copyright 2022 Manuel Wrage. Use of this source code is governed by the Apache 2.0 license.

diff --git a/gradle-plugin/src/main/kotlin/com/ivianuu/injekt/gradle/InjektPlugin.kt b/gradle-plugin/src/main/kotlin/com/ivianuu/injekt/gradle/InjektPlugin.kt
@@ -5,12 +5,8 @@
 package com.ivianuu.injekt.gradle
 
 import com.google.auto.service.*
-import com.google.devtools.ksp.gradle.*
 import org.gradle.api.*
-import org.gradle.api.provider.*
-import org.jetbrains.kotlin.gradle.dsl.*
 import org.jetbrains.kotlin.gradle.plugin.*
-import java.util.Locale.*
 
 @AutoService(KotlinCompilerPluginSupportPlugin::class)
 class InjektPlugin : KotlinCompilerPluginSupportPlugin {

diff --git a/integration-tests/src/test/kotlin/com/ivianuu/injekt/integrationtests/CUtil.kt b/integration-tests/src/test/kotlin/com/ivianuu/injekt/integrationtests/CUtil.kt
@@ -11,21 +11,14 @@ import com.ivianuu.injekt.compiler.*
 import com.ivianuu.injekt.compiler.ir.*
 import com.ivianuu.injekt.ksp.*
 import com.tschuchort.compiletesting.*
-import com.tschuchort.compiletesting.SourceFile
 import io.kotest.matchers.*
 import io.kotest.matchers.string.*
 import org.intellij.lang.annotations.*
-import org.jetbrains.kotlin.analyzer.*
 import org.jetbrains.kotlin.backend.common.extensions.*
-import org.jetbrains.kotlin.com.intellij.openapi.project.*
 import org.jetbrains.kotlin.compiler.plugin.*
 import org.jetbrains.kotlin.config.*
-import org.jetbrains.kotlin.descriptors.*
 import org.jetbrains.kotlin.ir.declarations.*
 import org.jetbrains.kotlin.name.*
-import org.jetbrains.kotlin.psi.*
-import org.jetbrains.kotlin.resolve.*
-import org.jetbrains.kotlin.resolve.extensions.*
 import java.net.*
 import java.nio.file.*
 import kotlin.reflect.*

diff --git a/sample/src/main/kotlin/com/ivianuu/injekt/samples/android/app/App.kt b/sample/src/main/kotlin/com/ivianuu/injekt/samples/android/app/App.kt
@@ -13,6 +13,9 @@ class App : Application() {
   @Provide private val appScope = Scope<AppScope>()
   val appComponent by lazy { inject<AppComponent>() }
 }
+
 object AppScope
 
-@Provide data class AppComponent(val mainActivityComponent: (Scope<ActivityScope>) -> MainActivityComponent)
+@Provide data class AppComponent(
+  val mainActivityComponent: (Scope<ActivityScope>) -> MainActivityComponent
+)