8000 upgrade gradle to 7.6.1 · jasync-sql/jasync-sql@eb41ab0 · GitHub
[go: up one dir, main page]

Skip to content

Commit eb41ab0

Browse files
committed
upgrade gradle to 7.6.1
1 parent 288c11a commit eb41ab0

File tree

9 files changed

+48
-93
lines changed

9 files changed

+48
-93
lines changed

.travis.yml

Lines changed: 0 additions & 41 deletions
This file was deleted.

build.gradle.kts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,10 +91,6 @@ subprojects {
9191
withJavadocJar()
9292
}
9393

94-
sourceSets.main {
95-
java.srcDirs("src/main/java")
96-
}
97-
9894
val varintName = when (project.name) {
9995
"db-async-common" -> "jasync-common"
10096
"pool-async" -> "jasync-pool"

db-async-common/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ val LOGBACK_VERSION: String by project
1111
val AWAITILITY_VERSION: String by project
1212

1313
dependencies {
14-
compile(project(":pool-async"))
14+
api(project(":pool-async"))
1515
api("org.jetbrains.kotlin:kotlin-stdlib-jdk8:$KOTLIN_VERSION")
16-
compile("org.jetbrains.kotlinx:kotlinx-coroutines-core:$KOTLIN_COROUTINES_VERSION")
16+
api("org.jetbrains.kotlinx:kotlinx-coroutines-core:$KOTLIN_COROUTINES_VERSION")
1717
implementation("org.slf4j:slf4j-api:$SL4J_VERSION")
1818
implementation("io.netty:netty-transport:$NETTY_VERSION")
1919
implementation("io.netty:netty-handler:$NETTY_VERSION")

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-all.zip

mysql-async/build.gradle.kts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ val MYSQL_CONNECTOR_VERSION: String by project
1313
val AWAITILITY_VERSION: String by project
1414

1515
dependencies {
16-
compile(project(":pool-async"))
17-
compile(project(":db-async-common"))
18-
compile("org.jetbrains.kotlin:kotlin-stdlib-jdk8:$KOTLIN_VERSION")
19-
compile("org.jetbrains.kotlinx:kotlinx-coroutines-core:$KOTLIN_COROUTINES_VERSION")
20-
compile("org.slf4j:slf4j-api:$SL4J_VERSION")
21-
compile("io.netty:netty-transport:$NETTY_VERSION")
22-
compile("io.netty:netty-handler:$NETTY_VERSION")
16+
api(project(":pool-async"))
17+
api(project(":db-async-common"))
18+
api("org.jetbrains.kotlin:kotlin-stdlib-jdk8:$KOTLIN_VERSION")
19+
api("org.jetbrains.kotlinx:kotlinx-coroutines-core:$KOTLIN_COROUTINES_VERSION")
20+
api("org.slf4j:slf4j-api:$SL4J_VERSION")
21+
api("io.netty:netty-transport:$NETTY_VERSION")
22+
api("io.netty:netty-handler:$NETTY_VERSION")
2323
testImplementation("io.netty:netty-transport-native-epoll:$NETTY_VERSION:linux-x86_64")
24-
compile("io.github.microutils:kotlin-logging:$KOTLIN_LOGGING_VERSION")
24+
api("io.github.microutils:kotlin-logging:$KOTLIN_LOGGING_VERSION")
2525
testImplementation("junit:junit:$JUNIT_VERSION")
2626
testImplementation("org.jetbrains.kotlin:kotlin-test-junit:$KOTLIN_VERSION")
2727
testImplementation("org.assertj:assertj-core:$ASSERTJ_VERSION")

pool-async/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ val AWAITILITY_VERSION: String by project
1212
dependencies {
1313
api("org.jetbrains.kotlin:kotlin-stdlib-jdk8:$KOTLIN_VERSION")
1414
api("org.jetbrains.kotlin:kotlin-reflect:$KOTLIN_VERSION")
15-
compile("org.jetbrains.kotlinx:kotlinx-coroutines-core:$KOTLIN_COROUTINES_VERSION")
15+
api("org.jetbrains.kotlinx:kotlinx-coroutines-core:$KOTLIN_COROUTINES_VERSION")
1616
implementation("org.slf4j:slf4j-api:$SL4J_VERSION")
1717
implementation("io.github.microutils:kotlin-logging:$KOTLIN_LOGGING_VERSION")
1818
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:$KOTLIN_COROUTINES_VERSION")

postgis-jasync/build.gradle.kts

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,18 @@ val AWAITILITY_VERSION: String by project
1616
val JTS_VERSION: String by project
1717

1818
dependencies {
19-
compile(project(":db-async-common"))
20-
compile(project(":pool-async"))
21-
compile(project(":postgresql-async"))
22-
compile("org.jetbrains.kotlin:kotlin-stdlib-jdk8:$KOTLIN_VERSION")
23-
compile("org.jetbrains.kotlinx:kotlinx-coroutines-core:$KOTLIN_COROUTINES_VERSION")
24-
compile("org.slf4j:slf4j-api:$SL4J_VERSION")
25-
compile("joda-time:joda-time:$JODA_VERSION")
26-
compile("io.netty:netty-transport:$NETTY_VERSION")
27-
compile("io.netty:netty-handler:$NETTY_VERSION")
28-
compile("io.github.microutils:kotlin-logging:$KOTLIN_LOGGING_VERSION")
29-
compile("com.ongres.scram:client:$SCRAM_CLIENT_VERSION")
30-
compile("org.threeten:threeten-extra:$THREETEN_EXTRA")
19+
api(project(":db-async-common"))
20+
api(project(":pool-async"))
21+
api(project(":postgresql-async"))
22+
api("org.jetbrains.kotlin:kotlin-stdlib-jdk8:$KOTLIN_VERSION")
23+
api("org.jetbrains.kotlinx:kotlinx-coroutines-core:$KOTLIN_COROUTINES_VERSION")
24+
api("org.slf4j:slf4j-api:$SL4J_VERSION")
25+
api("joda-time:joda-time:$JODA_VERSION")
26+
api("io.netty:netty-transport:$NETTY_VERSION")
27+
api("io.netty:netty-handler:$NETTY_VERSION")
28+
api("io.github.microutils:kotlin-logging:$KOTLIN_LOGGING_VERSION")
29+
api("com.ongres.scram:client:$SCRAM_CLIENT_VERSION")
30+
api("org.threeten:threeten-extra:$THREETEN_EXTRA")
3131
testImplementation("junit:junit:$JUNIT_VERSION")
3232
testImplementation("org.jetbrains.kotlin:kotlin-test-junit:$KOTLIN_VERSION")
3333
testImplementation("org.jetbrains.kotlin:kotlin-test-junit:$KOTLIN_VERSION")
@@ -37,5 +37,5 @@ dependencies {
3737
testImplementation("ch.qos.logback:logback-classic:$LOGBACK_VERSION")
3838
testImplementation("org.testcontainers:postgresql:$TEST_CONTAINERS_VERSION")
3939
testImplementation("org.awaitility:awaitility-kotlin:$AWAITILITY_VERSION")
40-
compile("org.locationtech.jts:jts-core:$JTS_VERSION")
40+
api("org.locationtech.jts:jts-core:$JTS_VERSION")
4141
}

postgresql-async/build.gradle.kts

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,17 @@ val TEST_CONTAINERS_VERSION: String by project
1515
val AWAITILITY_VERSION: String by project
1616

1717
dependencies {
18-
compile(project(":db-async-common"))
19-
compile(project(":pool-async"))
20-
compile("org.jetbrains.kotlin:kotlin-stdlib-jdk8:$KOTLIN_VERSION")
21-
compile("org.jetbrains.kotlinx:kotlinx-coroutines-core:$KOTLIN_COROUTINES_VERSION")
22-
compile("org.slf4j:slf4j-api:$SL4J_VERSION")
23-
compile("joda-time:joda-time:$JODA_VERSION")
24-
compile("io.netty:netty-transport:$NETTY_VERSION")
25-
compile("io.netty:netty-handler:$NETTY_VERSION")
26-
compile("io.github.microutils:kotlin-logging:$KOTLIN_LOGGING_VERSION")
27-
compile("com.ongres.scram:client:$SCRAM_CLIENT_VERSION")
28-
compile("org.threeten:threeten-extra:$THREETEN_EXTRA")
18+
api(project(":db-async-common"))
19+
api(project(":pool-async"))
20+
api("org.jetbrains.kotlin:kotlin-stdlib-jdk8:$KOTLIN_VERSION")
21+
api("org.jetbrains.kotlinx:kotlinx-coroutines-core:$KOTLIN_COROUTINES_VERSION")
22+
api("org.slf4j:slf4j-api:$SL4J_VERSION")
23+
api("joda-time:joda-time:$JODA_VERSION")
24+
api("io.netty:netty-transport:$NETTY_VERSION")
25+
api("io.netty:netty-handler:$NETTY_VERSION")
26+
api("io.github.microutils:kotlin-logging:$KOTLIN_LOGGING_VERSION")
27+
api("com.ongres.scram:client:$SCRAM_CLIENT_VERSION")
28+
api("org.threeten:threeten-extra:$THREETEN_EXTRA")
2929
testImplementation("junit:junit:$JUNIT_VERSION")
3030
testImplementation("org.jetbrains.kotlin:kotlin-test-junit:$KOTLIN_VERSION")
3131
testImplementation("org.jetbrains.kotlin:kotlin-test-junit:$KOTLIN_VERSION")

r2dbc-mysql/build.gradle.kts

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,20 +21,20 @@ repositories {
2121
}
2222

2323
dependencies {
24-
compile(project(":db-async-common"))
25-
compile(project(":pool-async"))
26-
compile(project(":mysql-async"))
27-
compile("org.jetbrains.kotlin:kotlin-stdlib-jdk8:$KOTLIN_VERSION")
28-
compile("org.jetbrains.kotlin:kotlin-reflect:$KOTLIN_VERSION")
29-
compile("io.r2dbc:r2dbc-spi:$R2DBC_SPI_VERSION")
24+
api(project(":db-async-common"))
25+
api(project(":pool-async"))
26+
api(project(":mysql-async"))
27+
api("org.jetbrains.kotlin:kotlin-stdlib-jdk8:$KOTLIN_VERSION")
28+
api("org.jetbrains.kotlin:kotlin-reflect:$KOTLIN_VERSION")
29+
api("io.r2dbc:r2dbc-spi:$R2DBC_SPI_VERSION")
3030
implementation("io.projectreactor:reactor-core:$REACTOR_CORE_VERSION")
3131
implementation("io.projectreactor.kotlin:reactor-kotlin-extensions:1.1.7")
32-
compile("org.slf4j:slf4j-api:$SL4J_VERSION")
33-
compile("joda-time:joda-time:$JODA_VERSION")
34-
compile("org.joda:joda-convert:$JODA_CONVERT_VERSION")
35-
compile("io.netty:netty-transport:$NETTY_VERSION")
36-
compile("io.netty:netty-handler:$NETTY_VERSION")
37-
compile("io.github.microutils:kotlin-logging:$KOTLIN_LOGGING_VERSION")
32+
api("org.slf4j:slf4j-api:$SL4J_VERSION")
33+
api("joda-time:joda-time:$JODA_VERSION")
34+
api("org.joda:joda-convert:$JODA_CONVERT_VERSION")
35+
api("io.netty:netty-transport:$NETTY_VERSION")
36+
api("io.netty:netty-handler:$NETTY_VERSION")
37+
api("io.github.microutils:kotlin-logging:$KOTLIN_LOGGING_VERSION")
3838
testImplementation("org.springframework.data:spring-data-r2dbc:1.5.6")
3939
testImplementation("io.r2dbc:r2dbc-pool:1.0.0.RELEASE")
4040
testImplementation("junit:junit:$JUNIT_VERSION")

0 commit comments

Comments
 (0)
0