Merge branch '2.0.0' into toda_k/reproducible-build

# Conflicts:
#	projects/koin-ksp-compiler/src/jvmMain/kotlin/org/koin/compiler/verify/KoinTagWriter.kt

.github/workflows/build.yml

@@ -26,7 +26,7 @@ jobs:
         uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
-          java-version: 11
+          java-version: 17
 
       - name: Setup Gradle
         uses: gradle/gradle-build-action@v2

.gitignore

@@ -8,5 +8,6 @@ classes/
 .DS_Store
 /build
 /captures
+.kotlin
 
 

examples/android-coffee-maker/build.gradle.kts

@@ -10,6 +10,7 @@ val androidMinSDK : String by project
 android {
     compileSdk = androidCompileSDK.toInt()
     defaultConfig {
+        namespace = "org.koin.sample.androidx"
         minSdk = androidMinSDK.toInt()
         applicationId = "org.gradle.kotlin.dsl.samples.androidstudio"
         versionCode = 1
@@ -32,6 +33,14 @@ android {
             }
         }
     }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+    kotlinOptions {
+        jvmTarget = "17"
+    }
 }
 
 dependencies {

examples/android-library/build.gradle.kts

@@ -10,6 +10,7 @@ val androidMinSDK : String by project
 android {
     compileSdk = androidCompileSDK.toInt()
     defaultConfig {
+        namespace = "org.koin.sample.android.library"
         minSdk = androidMinSDK.toInt()
     }
     // to use KSP generated Code
@@ -21,6 +22,14 @@ android {
             }
         }
     }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+    kotlinOptions {
+        jvmTarget = "17"
+    }
 }
 
 dependencies {

examples/gradle.properties

@@ -9,5 +9,5 @@ kotlin.code.style=official
 
 #Android
 android.useAndroidX=true
-androidMinSDK=14
+androidMinSDK=21
 androidCompileSDK=34

examples/gradle/libs.versions.toml

@@ -3,14 +3,14 @@
 # /!\ Koin in gradle.properties /!\
 
 # Core
-kotlin = "1.9.24"
-koin = "3.5.6"
-koinAnnotations = "1.4.0"
-ksp = "1.9.24-1.0.20"
+kotlin = "2.0.21"
+koin = "4.0.1-RC2"
+koinAnnotations = "2.0.0-Beta2"
+ksp = "2.0.21-1.0.28"
 junit = "4.13.2"
 # Android
-agp = "7.4.2"
-androidCompat = "1.6.1"
+agp = "8.3.2"
+androidCompat = "1.7.0"
 
 [libraries]
 koin-core = { module = "io.insert-koin:koin-core", version.ref = "koin" }

examples/gradle/wrapper/gradle-wrapper.properties

@@ -1,4 +1,4 @@
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists

projects/gradle.properties

@@ -7,7 +7,7 @@ org.gradle.parallel=true
 #Kotlin
 kotlin.code.style=official
 #Koin
-koinAnnotationsVersion=1.4.0
+koinAnnotationsVersion=2.0.0-Beta3
 #Android
 android.useAndroidX=true
 androidMinSDK=14

projects/gradle/libs.versions.toml

@@ -3,9 +3,9 @@
 # /!\ Koin in gradle.properties /!\
 
 # Core
-kotlin = "1.9.24"
-koin = "3.5.6"
-ksp = "1.9.24-1.0.20"
+kotlin = "2.0.21"
+koin = "4.0.0"
+ksp = "2.0.21-1.0.28"
 publish = "2.0.0"
 dokka = "1.9.10"
 

projects/koin-ksp-compiler/src/jvmMain/kotlin/org/koin/compiler/generator/DefaultModuleWriter.kt

@@ -30,7 +30,7 @@ class DefaultModuleWriter(
     override val hasExternalDefinitions: Boolean = true
     override val generateModuleBody: Boolean = generateDefaultModule
 
-    override fun writeModuleFooter() {
+    override fun writeModuleFooter(closeBrackets : Boolean) {
         writeln(DEFAULT_MODULE_FOOTER)
     }
 }

projects/koin-ksp-compiler/src/jvmMain/kotlin/org/koin/compiler/generator/KoinCodeGenerator.kt

@@ -66,7 +66,7 @@ class KoinCodeGenerator(
 
         checkAlreadyGenerated(module)
 
-        if (module.alreadyGenerated == false && !module.isExpect){
+        if (module.alreadyGenerated == false){
             ClassModuleWriter(codeGenerator, resolver, module).writeModule(isComposeViewModelActive)
         }
     }

projects/koin-ksp-compiler/src/jvmMain/kotlin/org/koin/compiler/generator/ModuleWriter.kt

@@ -63,7 +63,10 @@ abstract class ModuleWriter(
 
         writeEmptyLine()
 
-        if (generateModuleBody){
+        if (module.isExpect){
+            writeModuleFooter(closeBrackets = false)
+
+        } else if (generateModuleBody){
             writeModuleFunction()
             writeModuleInstance()
             writeModuleIncludes()
@@ -197,10 +200,19 @@ abstract class ModuleWriter(
     private fun generateExternalDefinitionCalls(): String =
         module.externalDefinitions.joinToString(separator = "\n${TAB}") { "${it.name}()" }
 
-    open fun writeModuleFooter() {
-        writeln(MODULE_FOOTER)
+    open fun writeModuleFooter(closeBrackets : Boolean = true) {
+        if (closeBrackets) {
+            writeln(MODULE_FOOTER)
+        }
+
         val visibilityString = module.visibility.toSourceString()
-        writeln("${visibilityString}val $modulePath.module : org.koin.core.module.Module get() = $generatedField")
+        val actualKeyword = when {
+            module.isActual -> "actual "
+            module.isExpect -> "expect "
+            else -> ""
+        }
+        val returnedValue = if (!module.isExpect) " get() = $generatedField" else ""
+        writeln("${actualKeyword}${visibilityString}val $modulePath.module : org.koin.core.module.Module${returnedValue}")
     }
 
     open fun onFinishWriteModule() {

projects/koin-ksp-compiler/src/jvmMain/kotlin/org/koin/compiler/metadata/AnnotationMetadata.kt

@@ -40,7 +40,7 @@ val SCOPED = DefinitionAnnotation("scoped", annotationType = Scoped::class)
 val KOIN_VIEWMODEL = DefinitionAnnotation("viewModel", "org.koin.androidx.viewmodel.dsl.viewModel", KoinViewModel::class)
 
 //TODO Remove isComposeViewModelActive with Koin 4
-val KOIN_VIEWMODEL_COMPOSE = DefinitionAnnotation("viewModel", "org.koin.compose.viewmodel.dsl.viewModel", KoinViewModel::class)
+val KOIN_VIEWMODEL_COMPOSE = DefinitionAnnotation("viewModel", "org.koin.core.module.dsl.viewModel", KoinViewModel::class)
 
 val KOIN_WORKER = DefinitionAnnotation("worker", "org.koin.androidx.workmanager.dsl.worker", KoinWorker::class)
 

projects/koin-ksp-compiler/src/jvmMain/kotlin/org/koin/compiler/metadata/KoinMetaData.kt

@@ -37,7 +37,8 @@ sealed class KoinMetaData {
         val isCreatedAtStart: Boolean? = null,
         val visibility: Visibility = Visibility.PUBLIC,
         val isDefault: Boolean = false,
-        val isExpect : Boolean = false
+        val isExpect : Boolean = false,
+        val isActual : Boolean = false
     ) : KoinMetaData() {
 
         var alreadyGenerated : Boolean? = null

projects/koin-ksp-compiler/src/jvmMain/kotlin/org/koin/compiler/scanner/ModuleScanner.kt

@@ -33,6 +33,7 @@ class ModuleScanner(
         val isCreatedAtStart = getIsCreatedAtStart(annotations)
         val componentScan = getComponentScan(annotations)
         val isExpect = declaration.isExpect
+        val isActual = declaration.isActual
 
         val name = "$element"
         val type = if (declaration.classKind == ClassKind.OBJECT) {
@@ -49,7 +50,8 @@ class ModuleScanner(
             includes = includes.toModuleIncludes(),
             isCreatedAtStart = isCreatedAtStart,
             visibility = declaration.getVisibility(),
-            isExpect = isExpect
+            isExpect = isExpect,
+            isActual = isActual
         )
 
         val annotatedFunctions = declaration.getAllFunctions()

projects/koin-ksp-compiler/src/jvmMain/kotlin/org/koin/compiler/scanner/ext/KspExt.kt

@@ -92,7 +92,9 @@ fun List<KSValueParameter>.getParameters(): List<KoinMetaData.DefinitionParamete
 }
 
 private fun getParameter(param: KSValueParameter): KoinMetaData.DefinitionParameter {
-    val firstAnnotation = param.annotations.firstOrNull()
+    // Get the first annotation that is not a Provided annotation
+    // The [Provided] annotation will be evaluated when making the dependency graph.
+    val firstAnnotation = param.annotations.filter { it.shortName.asString() != Provided::class.simpleName }.firstOrNull()
     val annotationName = firstAnnotation?.shortName?.asString()
     val annotationValue = firstAnnotation?.arguments?.getValueArgument()
     val paramName = param.name?.asString()
@@ -105,15 +107,15 @@ private fun getParameter(param: KSValueParameter): KoinMetaData.DefinitionParame
     val isLazy = resolvedTypeString.startsWith("Lazy<")
 
     return when (annotationName) {
-        "${InjectedParam::class.simpleName}" -> KoinMetaData.DefinitionParameter.ParameterInject(name = paramName, isNullable = isNullable, hasDefault = hasDefault)
+        "${InjectedParam::class.simpleName}" -> KoinMetaData.DefinitionParameter.ParameterInject(name = paramName, isNullable = isNullable, hasDefault = hasDefault,)
         "${Property::class.simpleName}" -> KoinMetaData.DefinitionParameter.Property(name = paramName, value = annotationValue, isNullable, hasDefault = hasDefault)
         "${Named::class.simpleName}" -> {
             val qualifier = firstAnnotation.arguments.getNamed().getValue()
-            KoinMetaData.DefinitionParameter.Dependency(name = paramName, qualifier = qualifier, isNullable = isNullable, hasDefault = hasDefault, type = resolvedType)
+            KoinMetaData.DefinitionParameter.Dependency(name = paramName, qualifier = qualifier, isNullable = isNullable, hasDefault = hasDefault, type = resolvedType, alreadyProvided = hasProvidedAnnotation(param))
         }
         "${Qualifier::class.simpleName}" -> {
             val qualifier = firstAnnotation.arguments.getQualifier().getValue()
-            KoinMetaData.DefinitionParameter.Dependency(name = paramName, qualifier = qualifier, isNullable = isNullable, hasDefault = hasDefault, type = resolvedType)
+            KoinMetaData.DefinitionParameter.Dependency(name = paramName, qualifier = qualifier, isNullable = isNullable, hasDefault = hasDefault, type = resolvedType, alreadyProvided = hasProvidedAnnotation(param))
         }
         "${ScopeId::class.simpleName}" -> {
             val scopeIdValue: String = firstAnnotation.arguments.getScope().getValue()
@@ -126,8 +128,7 @@ private fun getParameter(param: KSValueParameter): KoinMetaData.DefinitionParame
                 isLazy -> KoinMetaData.DependencyKind.Lazy
                 else -> KoinMetaData.DependencyKind.Single
             }
-            val provided = (annotationName == "${Provided::class.simpleName}")
-            KoinMetaData.DefinitionParameter.Dependency(name = paramName, hasDefault = hasDefault, kind = kind,  isNullable = isNullable, type = resolvedType, alreadyProvided = provided)
+            KoinMetaData.DefinitionParameter.Dependency(name = paramName, hasDefault = hasDefault, kind = kind,  isNullable = isNullable, type = resolvedType, alreadyProvided = hasProvidedAnnotation(param))
         }
     }
 }
@@ -144,3 +145,7 @@ fun String.filterForbiddenKeywords() : String{
         if (it in forbiddenKeywords) "`$it`" else it
     }
 }
+
+private fun hasProvidedAnnotation(param: KSValueParameter): Boolean {
+    return param.annotations.any { it.shortName.asString() == Provided::class.simpleName }
+}

projects/koin-ksp-compiler/src/jvmMain/kotlin/org/koin/compiler/verify/KoinTagWriter.kt

@@ -147,4 +147,4 @@ class KoinTagWriter(val codeGenerator: CodeGenerator, val logger: KSPLogger) {
         fileStream.appendText("\n$tag")
         alreadyDeclared.add(tagName)
     }
-}
+}