Skip to content
This repository has been archived by the owner on Jan 20, 2023. It is now read-only.

Commit

Permalink
Merge pull request #28 from k163377/update_libs
Browse files Browse the repository at this point in the history
Update libs.
  • Loading branch information
k163377 authored Dec 23, 2020
2 parents bea8f42 + 5350bad commit e5a1a15
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 9 deletions.
16 changes: 8 additions & 8 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
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("org.jlleitschuh.gradle.ktlint") version "9.4.1"
id("jacoco")
id("com.github.ben-manes.versions") version "0.28.0"
}

group = "com.mapk"
version = "0.18"
version = "0.0.19"

java {
sourceCompatibility = JavaVersion.VERSION_1_8
Expand All @@ -33,23 +33,23 @@ repositories {
dependencies {
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
implementation(kotlin("reflect"))
api("com.github.ProjectMapK:Shared:0.18")
api("com.github.ProjectMapK:Shared:0.19")
// 使うのはRowMapperのみなため他はexclude、またバージョンそのものは使う相手に合わせるためcompileOnly
compileOnly(group = "org.springframework", name = "spring-jdbc", version = "5.2.7.RELEASE") {
compileOnly(group = "org.springframework", name = "spring-jdbc", version = "5.3.2") {
exclude(module = "spring-beans")
exclude(module = "spring-jcl")
exclude(module = "spring-tx")
}

// 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
testImplementation("io.mockk:mockk:1.10.0")
testImplementation("io.mockk:mockk:1.10.3-jdk8")

// テスト時には無いと困るため、別口でimplementation
testImplementation(group = "org.springframework", name = "spring-jdbc", version = "5.2.7.RELEASE")
testImplementation(group = "org.springframework", name = "spring-jdbc", version = "5.3.2")
// https://mvnrepository.com/artifact/com.h2database/h2
testImplementation(group = "com.h2database", name = "h2", version = "1.4.200")

Expand Down
6 changes: 5 additions & 1 deletion src/test/kotlin/com/mapk/krowmapper/UseDBMappingTest.kt
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,11 @@ class UseDBMappingTest {
isBar: String,
description: String?
) = Foo(
fooId, fooName, fooStatus, isBar.toBoolean(), description
fooId,
fooName,
fooStatus,
isBar.toBoolean(),
description
)
}
}
Expand Down

0 comments on commit e5a1a15

Please sign in to comment.