Test Bom in project + fix back KMP logger

InsertKoinIO · Aug 31, 2023 · 40cc6cd · 40cc6cd
1 parent 565f642
commit 40cc6cd
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 43 deletions.
diff --git a/android/koin-android/src/test/java/org/koin/test/android/AndroidModuleTest.kt b/android/koin-android/src/test/java/org/koin/test/android/AndroidModuleTest.kt
@@ -98,6 +98,6 @@ class AndroidModuleTest : KoinTest {
             modules(SampleModule)
         }.koin
 
-        assertTrue(koin.logger is PrintLogger)
+        assertTrue(koin.logger is EmptyLogger)
     }
 }
diff --git a/bom/koin-bom/build.gradle b/bom/koin-bom/build.gradle
@@ -22,7 +22,7 @@ dependencies {
         api "io.insert-koin:koin-android-compat:$koin_android_version"
         api "io.insert-koin:koin-android-test:$koin_android_version"
         api "io.insert-koin:koin-androidx-navigation:$koin_android_version"
-        api "io.insert-koin:koin-androidx-workmnanager:$koin_android_version"
+        api "io.insert-koin:koin-androidx-workmanager:$koin_android_version"
         // compose
         api "io.insert-koin:koin-androidx-compose:$koin_androidx_compose_version"
         api "io.insert-koin:koin-androidx-compose-navigation:$koin_androidx_compose_version"

diff --git a/core/koin-core/src/commonMain/kotlin/org/koin/core/Koin.kt b/core/koin-core/src/commonMain/kotlin/org/koin/core/Koin.kt
@@ -22,9 +22,7 @@ import org.koin.core.component.getScopeName
 import org.koin.core.error.ScopeNotCreatedException
 import org.koin.core.extension.ExtensionManager
 import org.koin.core.logger.EmptyLogger
-import org.koin.core.logger.Level
 import org.koin.core.logger.Logger
-import org.koin.core.logger.PrintLogger
 import org.koin.core.module.Module
 import org.koin.core.module.flatten
 import org.koin.core.parameter.ParametersDefinition

diff --git a/core/koin-core/src/commonMain/kotlin/org/koin/core/logger/PrintLogger.kt b/core/koin-core/src/commonMain/kotlin/org/koin/core/logger/PrintLogger.kt
diff --git a/core/koin-core/src/jsMain/kotlin/org/koin/core/logger/PrintLogger.kt b/core/koin-core/src/jsMain/kotlin/org/koin/core/logger/PrintLogger.kt
@@ -19,7 +19,7 @@ package org.koin.core.logger
  * Logger that print on system.out
  * @author - Arnaud GIULIANI
  */
-actual class PrintLogger actual constructor(level: Level) : Logger(level) {
+class PrintLogger(level: Level = Level.INFO) : Logger(level) {
 
     override fun display(level: Level, msg: MESSAGE) {
         println("[$level] $KOIN_TAG $msg")

diff --git a/core/koin-core/src/jvmMain/kotlin/org/koin/core/logger/PrintLogger.kt b/core/koin-core/src/jvmMain/kotlin/org/koin/core/logger/PrintLogger.kt
@@ -19,7 +19,7 @@ package org.koin.core.logger
  * Logger that print on system.out
  * @author - Arnaud GIULIANI
  */
-actual class PrintLogger actual constructor(level: Level) : Logger(level) {
+class PrintLogger(level: Level = Level.INFO) : Logger(level) {
 
     private val printer = if (level >= Level.WARNING) System.err else System.out
 

diff --git a/core/koin-core/src/nativeMain/kotlin/org/koin/core/logger/PrintLogger.kt b/core/koin-core/src/nativeMain/kotlin/org/koin/core/logger/PrintLogger.kt
@@ -19,7 +19,7 @@ package org.koin.core.logger
  * Logger that print on system.out
  * @author - Arnaud GIULIANI
  */
-actual class PrintLogger actual constructor(level: Level) : Logger(level) {
+class PrintLogger(level: Level = Level.INFO) : Logger(level) {
 
     override fun display(level: Level, msg: MESSAGE) {
         println("[$level] $KOIN_TAG $msg")

diff --git a/examples/androidx-samples/build.gradle b/examples/androidx-samples/build.gradle
@@ -55,21 +55,19 @@ android {
 }
 
 dependencies {
-    // Leak
-    implementation 'com.squareup.leakcanary:leakcanary-android:2.7'
-
-    // Koin
-    implementation "io.insert-koin:koin-android:$koin_android_version"
-    implementation "io.insert-koin:koin-core-coroutines:$koin_version"
-    implementation "io.insert-koin:koin-androidx-workmanager:$koin_android_version"
-    implementation "io.insert-koin:koin-androidx-navigation:$koin_android_version"
-    testImplementation "io.insert-koin:koin-test-junit4:$koin_version"
 
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation "androidx.work:work-runtime-ktx:2.8.1"
-    // implementation "org.jetbrains.anko:anko-commons:0.10.4"
-
-    testImplementation "io.insert-koin:koin-android-test:$koin_android_version"
+    implementation 'com.squareup.leakcanary:leakcanary-android:2.7'
     testImplementation 'androidx.arch.core:core-testing:2.2.0'
     testImplementation "junit:junit:4.13.2"
+
+    // Koin
+    implementation platform("io.insert-koin:koin-bom:$koin_android_version")
+    implementation "io.insert-koin:koin-android"
+    implementation "io.insert-koin:koin-core-coroutines"
+    implementation "io.insert-koin:koin-androidx-workmanager"
+    implementation "io.insert-koin:koin-androidx-navigation"
+    testImplementation "io.insert-koin:koin-test-junit4"
+    testImplementation "io.insert-koin:koin-android-test"
 }