Fix #471

JetBrains · Nov 11, 2021 · 1db4b21 · 1db4b21
1 parent 49c3aac
commit 1db4b21
Show file tree

Hide file tree

Showing 32 changed files with 5 additions and 71 deletions.
diff --git a/base-portable/build.gradle b/base-portable/build.gradle
@@ -33,7 +33,6 @@ kotlin {
         commonMain {
             dependencies {
                 implementation kotlin('stdlib-common')
-                implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
 //                implementation "io.github.microutils:kotlin-logging:$kotlinLogging_version"
             }
         }

diff --git a/base/build.gradle b/base/build.gradle
@@ -19,7 +19,6 @@ kotlin {
         commonMain {
             dependencies {
                 implementation kotlin('stdlib-common')
-                implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
                 implementation project(':base-portable')
             }
         }

diff --git a/js-package/build.gradle b/js-package/build.gradle
@@ -4,7 +4,6 @@ plugins {
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
     implementation "org.jetbrains.kotlin:kotlin-stdlib-js:$kotlin_version"
 
     implementation project(':base-portable')

diff --git a/jvm-package/jvm-publish-batik/build.gradle b/jvm-package/jvm-publish-batik/build.gradle
@@ -12,7 +12,6 @@ kotlin {
         commonMain {
             dependencies {
                 compileOnly kotlin('stdlib-common')
-                compileOnly "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
             }
         }
         jvmMain {

diff --git a/jvm-package/jvm-publish-common/build.gradle b/jvm-package/jvm-publish-common/build.gradle
@@ -12,7 +12,6 @@ kotlin {
         commonMain {
             dependencies {
                 api kotlin('stdlib-common')
-                api "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
 
                 api project(':base-portable')
                 api project(':base')
@@ -118,10 +117,10 @@ publishing {
                     dep.appendNode('artifactId', 'kotlin-stdlib-jdk8')
                     dep.appendNode('version', kotlin_version)
                     // Kotlin reflection
-                    dep = deps.appendNode('dependency')
-                    dep.appendNode('groupId', 'org.jetbrains.kotlin')
-                    dep.appendNode('artifactId', 'kotlin-reflect')
-                    dep.appendNode('version', kotlin_version)
+//                    dep = deps.appendNode('dependency')
+//                    dep.appendNode('groupId', 'org.jetbrains.kotlin')
+//                    dep.appendNode('artifactId', 'kotlin-reflect')
+//                    dep.appendNode('version', kotlin_version)
                     // Kotlin test
 //                    dep = deps.appendNode('dependency')
 //                    dep.appendNode('groupId', 'org.jetbrains.kotlin')

diff --git a/jvm-package/jvm-publish-gis/build.gradle b/jvm-package/jvm-publish-gis/build.gradle
@@ -17,7 +17,6 @@ kotlin {
         commonMain {
             dependencies {
                 compileOnly kotlin('stdlib-common')
-                compileOnly "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
             }
         }
         jvmMain {

diff --git a/jvm-package/jvm-publish-jfx/build.gradle b/jvm-package/jvm-publish-jfx/build.gradle
@@ -12,7 +12,6 @@ kotlin {
         commonMain {
             dependencies {
                 compileOnly kotlin('stdlib-common')
-                compileOnly "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
             }
         }
         jvmMain {

diff --git a/livemap-demo/build.gradle b/livemap-demo/build.gradle
@@ -49,7 +49,6 @@ kotlin {
         commonMain {
             dependencies {
                 implementation kotlin('stdlib-common')
-                implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
                 implementation project(':base-portable')
                 implementation project(':base')
                 implementation project(':mapper-core')

diff --git a/livemap/build.gradle b/livemap/build.gradle
@@ -29,7 +29,6 @@ kotlin {
             dependencies {
                 implementation kotlin('test-common')
                 implementation kotlin('test-annotations-common')
-                implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
             }
         }
         jvmMain {

diff --git a/livemap/src/jvmTest/kotlin/jetbrains/livemap/LiveMapTestBase.kt b/livemap/src/jvmTest/kotlin/jetbrains/livemap/LiveMapTestBase.kt
@@ -75,34 +75,6 @@ abstract class LiveMapTestBase {
         }
     }
 
-    protected fun createEntity(name: String, componentTypes: List<KClass<out EcsComponent>>): EcsEntity {
-        val entity = componentManager.createEntity(name)
-        componentTypes.forEach { aType ->
-            try {
-                entity.addComponents{ + aType.constructors.first().call() }
-            } catch (e: InstantiationException) {
-                throw IllegalStateException(e)
-            } catch (e: IllegalAccessException) {
-                throw IllegalStateException(e)
-            } catch (e: IllegalArgumentException) {
-                println(aType)
-                throw IllegalStateException(e)
-            }
-        }
-
-        return entity
-    }
-
-    protected fun createEntity(
-        name: String,
-        componentTypes: List<KClass<out EcsComponent>>,
-        vararg extraComponents: EcsComponent
-    ): EcsEntity {
-        return createEntity(name, componentTypes).apply {
-            listOf(*extraComponents).forEach { setComponent(it) }
-        }
-    }
-
     protected fun update(specs: Iterable<MockSpec>) {
         deltaTimeSpec().standard().apply()
         schedulerSpec().runAll().apply()

diff --git a/mapper-core/build.gradle b/mapper-core/build.gradle
@@ -33,7 +33,6 @@ kotlin {
         jvmMain {
             dependencies {
                 implementation kotlin('stdlib-jdk8')
-                implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
                 implementation "io.github.microutils:kotlin-logging-jvm:$kotlinLogging_version"
                 compileOnly "org.hamcrest:hamcrest-core:$hamcrest_version"
                 compileOnly "org.hamcrest:hamcrest-library:$hamcrest_version"

diff --git a/plot-base-portable/build.gradle b/plot-base-portable/build.gradle
@@ -48,7 +48,6 @@ kotlin {
             dependencies {
                 implementation kotlin('stdlib-jdk8')
                 implementation "io.github.microutils:kotlin-logging-jvm:$kotlinLogging_version"
-                implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
             }
         }
         jvmTest {
@@ -57,7 +56,7 @@ kotlin {
                 implementation kotlin('test-junit')
                 implementation "org.hamcrest:hamcrest-core:$hamcrest_version"
                 implementation "org.hamcrest:hamcrest-library:$hamcrest_version"
-                implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
+                implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" // for AesReflectTest
                 implementation "org.mockito:mockito-core:$mockito_version"
                 implementation "org.assertj:assertj-core:$assertj_version"
             }

diff --git a/plot-builder-portable/build.gradle b/plot-builder-portable/build.gradle
@@ -45,7 +45,6 @@ kotlin {
             dependencies {
                 implementation kotlin('stdlib-jdk8')
                 implementation "io.github.microutils:kotlin-logging-jvm:$kotlinLogging_version"
-                implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
             }
         }
         jvmTest {
@@ -54,7 +53,6 @@ kotlin {
                 implementation kotlin('test-junit')
                 implementation "org.hamcrest:hamcrest-core:$hamcrest_version"
                 implementation "org.hamcrest:hamcrest-library:$hamcrest_version"
-                implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
                 implementation "org.mockito:mockito-core:$mockito_version"
                 implementation "org.assertj:assertj-core:$assertj_version"
             }

diff --git a/plot-builder/build.gradle b/plot-builder/build.gradle
@@ -32,7 +32,6 @@ kotlin {
             dependencies {
                 implementation kotlin('stdlib-jdk8')
                 implementation "io.github.microutils:kotlin-logging-jvm:$kotlinLogging_version"
-                implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
             }
         }
         jvmTest {
@@ -41,7 +40,6 @@ kotlin {
                 implementation kotlin('test-junit')
                 implementation "org.hamcrest:hamcrest-core:$hamcrest_version"
                 implementation "org.hamcrest:hamcrest-library:$hamcrest_version"
-                implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
                 implementation "org.mockito:mockito-core:$mockito_version"
                 implementation "org.assertj:assertj-core:$assertj_version"
             }

diff --git a/plot-config-portable/build.gradle b/plot-config-portable/build.gradle
@@ -32,7 +32,6 @@ kotlin {
         commonMain {
             dependencies {
                 implementation kotlin('stdlib-common')
-                implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
 //                implementation "io.github.microutils:kotlin-logging:$kotlinLogging_version"
 
                 implementation project(':base-portable')
@@ -54,7 +53,6 @@ kotlin {
             dependencies {
                 implementation kotlin('stdlib-jdk8')
                 implementation "io.github.microutils:kotlin-logging-jvm:$kotlinLogging_version"
-                implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
 
                 implementation project(':vis-svg-portable')
             }
@@ -65,7 +63,6 @@ kotlin {
                 implementation kotlin('test-junit')
                 implementation "org.hamcrest:hamcrest-core:$hamcrest_version"
                 implementation "org.hamcrest:hamcrest-library:$hamcrest_version"
-                implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
                 implementation "org.mockito:mockito-core:$mockito_version"
                 implementation "org.assertj:assertj-core:$assertj_version"
             }

diff --git a/plot-config/build.gradle b/plot-config/build.gradle
@@ -37,7 +37,6 @@ kotlin {
             dependencies {
                 implementation kotlin('stdlib-jdk8')
                 implementation "io.github.microutils:kotlin-logging-jvm:$kotlinLogging_version"
-                implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
 
                 implementation project(':base')
                 implementation project(':vis-svg-mapper')
@@ -51,7 +50,6 @@ kotlin {
                 implementation kotlin('test-junit')
                 implementation "org.hamcrest:hamcrest-core:$hamcrest_version"
                 implementation "org.hamcrest:hamcrest-library:$hamcrest_version"
-                implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
                 implementation "org.mockito:mockito-core:$mockito_version"
                 implementation "org.assertj:assertj-core:$assertj_version"
 

diff --git a/plot-demo-common/build.gradle b/plot-demo-common/build.gradle
@@ -19,7 +19,6 @@ kotlin {
         commonMain {
             dependencies {
                 implementation kotlin('stdlib-common')
-                implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
                 implementation project(':base-portable')
                 implementation project(':base')
                 implementation project(':vis-svg-portable')

diff --git a/plot-demo/build.gradle b/plot-demo/build.gradle
@@ -30,7 +30,6 @@ kotlin {
         commonMain {
             dependencies {
                 implementation kotlin('stdlib-common')
-                implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
 
                 implementation project(':base-portable')
                 implementation project(':base')

diff --git a/plot-export-demo/build.gradle b/plot-export-demo/build.gradle
@@ -17,7 +17,6 @@ kotlin {
         commonMain {
             dependencies {
                 implementation kotlin('stdlib-common')
-                implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
 
                 implementation project(':base-portable')
                 implementation project(':plot-image-export')

diff --git a/plot-image-export/build.gradle b/plot-image-export/build.gradle
@@ -42,7 +42,6 @@ kotlin {
             dependencies {
                 implementation kotlin('stdlib-jdk8')
                 implementation "io.github.microutils:kotlin-logging-jvm:$kotlinLogging_version"
-                implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
 
 //                implementation project(':vis-svg-mapper')
 
@@ -60,7 +59,6 @@ kotlin {
                 implementation kotlin('test-junit')
                 implementation "org.hamcrest:hamcrest-core:$hamcrest_version"
                 implementation "org.hamcrest:hamcrest-library:$hamcrest_version"
-                implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
                 implementation "org.mockito:mockito-core:$mockito_version"
                 implementation "org.assertj:assertj-core:$assertj_version"
 

diff --git a/plot-livemap/build.gradle b/plot-livemap/build.gradle
@@ -25,7 +25,6 @@ kotlin {
         commonMain {
             dependencies {
                 implementation kotlin('stdlib-common')
-                implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
                 implementation project(':base-portable')
                 implementation project(':base')
                 implementation project(':plot-common-portable')
@@ -42,7 +41,6 @@ kotlin {
             dependencies {
                 implementation kotlin('test-common')
                 implementation kotlin('test-annotations-common')
-                implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
                 implementation project(':plot-config')
 //                implementation project(':plot-config-portable')
             }

diff --git a/vis-demo-common-batik/build.gradle b/vis-demo-common-batik/build.gradle
@@ -27,7 +27,6 @@ kotlin {
         jvmMain {
             dependencies {
                 implementation kotlin('stdlib-jdk8')
-                implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
                 implementation project(':vis-canvas')
                 implementation project(':vis-svg-mapper-batik')
                 implementation project(':vis-swing-common')

diff --git a/vis-demo-common-jfx/build.gradle b/vis-demo-common-jfx/build.gradle
@@ -27,7 +27,6 @@ kotlin {
         jvmMain {
             dependencies {
                 implementation kotlin('stdlib-jdk8')
-                implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
 
                 compileOnly("org.openjfx:javafx-swing:$jfx_version:${jfx_platform()}")
 

diff --git a/vis-demo-common/build.gradle b/vis-demo-common/build.gradle
@@ -21,7 +21,6 @@ kotlin {
         jvmMain {
             dependencies {
                 implementation kotlin('stdlib-jdk8')
-                implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
                 implementation "org.jetbrains.kotlinx:kotlinx-html-jvm:${kotlinx_html_version}"
             }
         }

diff --git a/vis-demo-svg-mapper/build.gradle b/vis-demo-svg-mapper/build.gradle
@@ -22,7 +22,6 @@ kotlin {
         commonMain {
             dependencies {
                 implementation kotlin('stdlib-common')
-                implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
 
                 implementation project(':base-portable')
                 implementation project(':base')

diff --git a/vis-svg-mapper-batik/build.gradle b/vis-svg-mapper-batik/build.gradle
@@ -21,7 +21,6 @@ kotlin {
         commonMain {
             dependencies {
                 implementation kotlin('stdlib-common')
-                implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
 
                 implementation project(':base-portable')
                 implementation project(':base')

diff --git a/vis-svg-mapper-jfx/build.gradle b/vis-svg-mapper-jfx/build.gradle
@@ -14,7 +14,6 @@ kotlin {
         commonMain {
             dependencies {
                 implementation kotlin('stdlib-common')
-                implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
 
                 implementation project(':base-portable')
                 implementation project(':base')

diff --git a/vis-svg-mapper/build.gradle b/vis-svg-mapper/build.gradle
@@ -26,7 +26,6 @@ kotlin {
         jvmMain {
             dependencies {
                 implementation kotlin('stdlib-jdk8')
-                compileOnly "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
             }
         }
         jvmTest {

diff --git a/vis-svg-portable/build.gradle b/vis-svg-portable/build.gradle
@@ -44,7 +44,6 @@ kotlin {
         jvmMain {
             dependencies {
                 implementation kotlin('stdlib-jdk8')
-                implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
             }
         }
         jvmTest {

diff --git a/vis-swing-batik/build.gradle b/vis-swing-batik/build.gradle
@@ -21,7 +21,6 @@ kotlin {
         jvmMain {
             dependencies {
                 implementation kotlin('stdlib-jdk8')
-                implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
                 implementation project(':vis-svg-mapper-batik')
                 implementation project(':vis-swing-common')
             }

diff --git a/vis-swing-common/build.gradle b/vis-swing-common/build.gradle
@@ -23,7 +23,6 @@ kotlin {
         jvmMain {
             dependencies {
                 implementation kotlin('stdlib-jdk8')
-                implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
 //                implementation project(':plot-config')
             }
         }

diff --git a/vis-swing-jfx/build.gradle b/vis-swing-jfx/build.gradle
@@ -22,7 +22,6 @@ kotlin {
         jvmMain {
             dependencies {
                 implementation kotlin('stdlib-jdk8')
-                implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
                 implementation project(':vis-svg-mapper-jfx')
                 implementation project(':vis-swing-common')