From a05ff9391cac08229035f82af3bf9e4821ad4eb8 Mon Sep 17 00:00:00 2001 From: wrongwrong Date: Wed, 23 Dec 2020 21:01:49 +0900 Subject: [PATCH 1/8] =?UTF-8?q?Kotlin=E3=81=AE=E3=82=A2=E3=83=83=E3=83=97?= =?UTF-8?q?=E3=83=87=E3=83=BC=E3=83=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 9c71270..a2aa3c5 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,7 +1,7 @@ plugins { id("maven") id("java") - id("org.jetbrains.kotlin.jvm") version "1.4.10" + id("org.jetbrains.kotlin.jvm") version "1.4.21" id("org.jlleitschuh.gradle.ktlint") version "9.3.0" id("jacoco") } From cbff9184e90d5ee63399dcf7dd1dbf32e67f49a7 Mon Sep 17 00:00:00 2001 From: wrongwrong Date: Wed, 23 Dec 2020 21:02:03 +0900 Subject: [PATCH 2/8] =?UTF-8?q?ktlint=E3=81=AE=E3=82=A2=E3=83=83=E3=83=97?= =?UTF-8?q?=E3=83=87=E3=83=BC=E3=83=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index a2aa3c5..e2d81b0 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -2,7 +2,7 @@ plugins { id("maven") id("java") id("org.jetbrains.kotlin.jvm") version "1.4.21" - id("org.jlleitschuh.gradle.ktlint") version "9.3.0" + id("org.jlleitschuh.gradle.ktlint") version "9.4.1" id("jacoco") } From ae000673d35b91ef5fc5723cc4f8e08c0b2e5794 Mon Sep 17 00:00:00 2001 From: wrongwrong Date: Wed, 23 Dec 2020 21:04:58 +0900 Subject: [PATCH 3/8] =?UTF-8?q?=E3=83=90=E3=83=BC=E3=82=B8=E3=83=A7?= =?UTF-8?q?=E3=83=B3=E3=82=A2=E3=83=83=E3=83=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index e2d81b0..42c4b53 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -7,7 +7,7 @@ plugins { } group = "com.mapk" -version = "0.18" +version = "0.19" java { sourceCompatibility = JavaVersion.VERSION_1_8 From 38524491002ecfe123b63837e0287cf1b118811b Mon Sep 17 00:00:00 2001 From: wrongwrong Date: Wed, 23 Dec 2020 21:06:19 +0900 Subject: [PATCH 4/8] =?UTF-8?q?=E3=83=95=E3=82=A9=E3=83=BC=E3=83=9E?= =?UTF-8?q?=E3=83=83=E3=83=86=E3=82=A3=E3=83=B3=E3=82=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapk/core/internal/FullInitializedFunctionWrapperTest.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/test/kotlin/com/mapk/core/internal/FullInitializedFunctionWrapperTest.kt b/src/test/kotlin/com/mapk/core/internal/FullInitializedFunctionWrapperTest.kt index b832344..9a75e7d 100644 --- a/src/test/kotlin/com/mapk/core/internal/FullInitializedFunctionWrapperTest.kt +++ b/src/test/kotlin/com/mapk/core/internal/FullInitializedFunctionWrapperTest.kt @@ -31,7 +31,9 @@ class FullInitializedFunctionWrapperTest { val func = Dst::class.companionObject!!.functions.first { it.name == "of" } val instance = Dst::class.companionObjectInstance!! val fullInitializedFunctionWrapper = FullInitializedFunctionWrapper( - func, instance, 3 + func, + instance, + 3 ) assertEquals(expected, fullInitializedFunctionWrapper.call(arrayOf(instance, 1, "2"))) } From a6ae25a4495cafc0b32831de3e5672d3a1507365 Mon Sep 17 00:00:00 2001 From: wrongwrong Date: Wed, 23 Dec 2020 21:11:52 +0900 Subject: [PATCH 5/8] =?UTF-8?q?=E3=82=A2=E3=83=8E=E3=83=86=E3=83=BC?= =?UTF-8?q?=E3=82=B7=E3=83=A7=E3=83=B3=E3=83=A9=E3=82=A4=E3=83=96=E3=83=A9?= =?UTF-8?q?=E3=83=AA=E3=82=92=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 42c4b53..0269276 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -31,7 +31,7 @@ dependencies { implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8") implementation(kotlin("reflect")) // https://mvnrepository.com/artifact/org.jetbrains/annotations - compileOnly(group = "org.jetbrains", name = "annotations", version = "19.0.0") + compileOnly(group = "org.jetbrains", name = "annotations", version = "20.1.0") // https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter testImplementation(group = "org.junit.jupiter", name = "junit-jupiter", version = "5.6.2") { From 6905084c14351a6ddb317c7bbdb62b1b11057d24 Mon Sep 17 00:00:00 2001 From: wrongwrong Date: Wed, 23 Dec 2020 21:12:10 +0900 Subject: [PATCH 6/8] =?UTF-8?q?junit=E3=81=AE=E3=82=A2=E3=83=83=E3=83=97?= =?UTF-8?q?=E3=83=87=E3=83=BC=E3=83=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 0269276..c663fff 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -34,7 +34,7 @@ dependencies { compileOnly(group = "org.jetbrains", name = "annotations", version = "20.1.0") // https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter - testImplementation(group = "org.junit.jupiter", name = "junit-jupiter", version = "5.6.2") { + testImplementation(group = "org.junit.jupiter", name = "junit-jupiter", version = "5.7.0") { exclude(group = "org.junit.vintage", module = "junit-vintage-engine") } // https://mvnrepository.com/artifact/io.mockk/mockk From 2c4d541c48a8bfc57f5bec7b1a535e4fd6809cdb Mon Sep 17 00:00:00 2001 From: wrongwrong Date: Wed, 23 Dec 2020 21:14:22 +0900 Subject: [PATCH 7/8] =?UTF-8?q?mockk=E3=81=AE=E3=82=A2=E3=83=83=E3=83=97?= =?UTF-8?q?=E3=83=87=E3=83=BC=E3=83=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index c663fff..06a4d1d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -38,7 +38,7 @@ dependencies { exclude(group = "org.junit.vintage", module = "junit-vintage-engine") } // https://mvnrepository.com/artifact/io.mockk/mockk - testImplementation("io.mockk:mockk:1.10.0") + testImplementation("io.mockk:mockk:1.10.3-jdk8") } tasks { From 3c53de2903a9174b355ef282aecb778cfd5ab5ae Mon Sep 17 00:00:00 2001 From: wrongwrong Date: Wed, 23 Dec 2020 21:18:06 +0900 Subject: [PATCH 8/8] =?UTF-8?q?IDE=E3=81=AB=E3=82=88=E3=82=8B=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/misc.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.idea/misc.xml b/.idea/misc.xml index 38b4a97..32e560b 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,9 @@ + + +