Skip to content

Commit a81b721

Browse files
committed
Update all dependencies.
1 parent 1e5d8fb commit a81b721

File tree

7 files changed

+47
-60
lines changed

7 files changed

+47
-60
lines changed

build.gradle.kts

+1-33
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,9 @@ plugins {
66
idea
77
`maven-publish`
88
id("com.adarshr.test-logger") version Versions.gradleTestLoggerPlugin apply false
9-
id("net.rdrei.android.buildtimetracker") version Versions.gradleBuildTimeTrackerPlugin
109
id("com.diffplug.spotless") version Versions.gradleSpotlessPlugin
1110
id("com.gorylenko.gradle-git-properties") version Versions.gradleGitPropertiesPlugin apply false
12-
id("com.apollographql.apollo") version Versions.gradleApolloPlugin apply false
11+
id("com.apollographql.apollo") version Versions.apollo apply false
1312
id("com.github.johnrengelman.shadow") version Versions.gradleShadowPlugin apply false
1413
id("io.micronaut.application") version Versions.gradleMicronautPlugin apply false
1514
id("io.micronaut.library") version Versions.gradleMicronautPlugin apply false
@@ -23,19 +22,8 @@ java {
2322
targetCompatibility = JavaVersion.VERSION_11
2423
}
2524

26-
buildtimetracker {
27-
reporters {
28-
register("summary") {
29-
options["ordered"] = "true"
30-
options["barstyle"] = "none"
31-
options["shortenTaskNames"] = "false"
32-
}
33-
}
34-
}
35-
3625
allprojects {
3726
apply(plugin = "idea")
38-
apply(plugin = "net.rdrei.android.buildtimetracker")
3927
apply(plugin = "com.diffplug.spotless")
4028

4129
apply(from = "${project.rootDir}/gradle/dependencyUpdates.gradle.kts")
@@ -103,15 +91,6 @@ subprojects {
10391
withSourcesJar()
10492
}
10593

106-
dependencies {
107-
// SpotBugs
108-
implementation("com.github.spotbugs:spotbugs-annotations:${Versions.spotbugsAnnotations}")
109-
110-
// JUnit
111-
testImplementation("org.junit.jupiter:junit-jupiter-api:${Versions.junit}")
112-
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:${Versions.junit}")
113-
}
114-
11594
if (publishingProjects.contains(project.name)) {
11695
publishing {
11796
publications {
@@ -139,15 +118,4 @@ subprojects {
139118
excludeEngines = setOf("junit-vintage")
140119
}
141120
}
142-
143-
// TODO remove after that issue will be fixed
144-
// Address https://github.com/gradle/gradle/issues/4823: Force parent project evaluation before sub-project evaluation for Kotlin build scripts
145-
/*
146-
if (gradle.startParameter.isConfigureOnDemand &&
147-
buildscript.sourceFile?.extension?.toLowerCase() == "kts" &&
148-
parent != rootProject) {
149-
generateSequence(parent) { project -> project.parent.takeIf { it != rootProject } }
150-
.forEach { evaluationDependsOn(it.path) }
151-
}
152-
*/
153121
}

buildSrc/src/main/java/Versions.kt

+23-24
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ object Versions {
22

33
// Languages
44

5-
const val kotlin = "1.4.31"
5+
const val kotlin = "1.5.0"
66

77
// Gradle plugins
88

@@ -12,59 +12,58 @@ object Versions {
1212
// https://plugins.gradle.org/plugin/com.adarshr.test-logger
1313
const val gradleTestLoggerPlugin = "3.0.0"
1414

15-
// https://plugins.gradle.org/plugin/net.rdrei.android.buildtimetracker
16-
const val gradleBuildTimeTrackerPlugin = "0.11.0"
17-
1815
// https://plugins.gradle.org/plugin/com.diffplug.spotless
19-
const val gradleSpotlessPlugin = "5.11.1"
16+
const val gradleSpotlessPlugin = "5.12.4"
2017

2118
// https://plugins.gradle.org/plugin/nu.studer.jooq
2219
const val gradleJooqPlugin = "5.2.1"
2320

2421
// https://plugins.gradle.org/plugin/com.gorylenko.gradle-git-properties
25-
const val gradleGitPropertiesPlugin = "2.3.0"
26-
27-
// https://plugins.gradle.org/plugin/com.apollographql.apollo
28-
const val gradleApolloPlugin = "2.5.5"
22+
const val gradleGitPropertiesPlugin = "2.3.1"
2923

3024
// https://plugins.gradle.org/plugin/com.github.johnrengelman.shadow
31-
const val gradleShadowPlugin = "6.1.0"
25+
const val gradleShadowPlugin = "7.0.0"
26+
27+
// https://plugins.gradle.org/plugin/io.github.kobylynskyi.graphql.codegen
28+
const val gradleGraphqlCodegenPlugin = "5.1.0"
3229

3330
// https://plugins.gradle.org/plugin/io.micronaut.application
34-
const val gradleMicronautPlugin = "1.4.2"
31+
const val gradleMicronautPlugin = "1.5.0"
3532

3633
// Libraries
3734

38-
const val micronaut = "2.4.1"
35+
// REMEMBER update micronautVersion in gradle.properties as well
36+
const val micronaut = "2.5.1"
3937

4038
// UPDATE together with Micronaut
41-
// https://repo1.maven.org/maven2/io/micronaut/micronaut-bom/2.4.1/micronaut-bom-2.4.1.pom
39+
// https://repo1.maven.org/maven2/io/micronaut/micronaut-bom/2.5.1/micronaut-bom-2.5.1.pom
4240
// https://repo1.maven.org/maven2/io/micronaut/sql/micronaut-jooq/3.4.0/micronaut-jooq-3.4.0.pom
4341
// https://repo1.maven.org/maven2/io/grpc/grpc-bom/1.33.1/grpc-bom-1.33.1.pom
4442
// https://repo1.maven.org/maven2/io/grpc/grpc-protobuf/1.33.1/grpc-protobuf-1.33.1.pom
4543
const val postgresql = "42.2.18"
4644
const val grpc = "1.33.1"
47-
const val flyway = "7.5.3"
45+
const val flyway = "7.7.3"
4846
const val jooq = "3.14.4"
4947
const val protobuf = "3.14.0"
5048
const val spotbugs = "4.0.3"
5149
const val slf4j = "1.7.26"
5250
const val picocli = "4.6.1"
51+
const val jakartaAnnotationApi = "1.3.5"
5352
// end
5453

5554
const val spotbugsAnnotations = "4.2.0"
5655
const val junit = "5.6.2"
5756
const val slugify = "2.4"
5857
const val graphQlDateTime = "4.0.0"
59-
const val graphQlTools = "11.0.0"
60-
const val apollo = "2.5.4"
61-
62-
const val jambalayaChecks = "0.2.0"
63-
const val jambalayaChecksJooq = "0.2.0"
64-
const val jambalayaGraphql = "0.2.0"
65-
const val jambalayaGraphqlApollo = "0.2.0"
66-
const val jambalayaGraphqlJooq = "0.2.0"
67-
const val jambalayaKotlinTest = "0.1.2"
68-
const val jambalayaMicronautGraphql = "0.2.0"
58+
const val graphQlTools = "11.0.1"
59+
const val apollo = "2.5.6"
60+
61+
const val jambalayaChecks = "0.3.0"
62+
const val jambalayaChecksJooq = "0.3.0"
63+
const val jambalayaGraphql = "0.3.0"
64+
const val jambalayaGraphqlApollo = "0.4.0"
65+
const val jambalayaGraphqlJooq = "0.3.0"
66+
const val jambalayaKotlinTest = "0.3.0"
67+
const val jambalayaMicronautGraphql = "0.3.0"
6968

7069
}

dumper-api-interface/build.gradle.kts

+8-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
plugins {
22
`java-library`
3-
id("io.github.kobylynskyi.graphql.codegen") version "4.1.5"
3+
id("io.github.kobylynskyi.graphql.codegen") version Versions.gradleGraphqlCodegenPlugin
4+
}
5+
6+
dependencies {
7+
implementation(platform("io.micronaut:micronaut-bom:${Versions.micronaut}"))
8+
implementation("com.github.spotbugs:spotbugs-annotations")
9+
10+
api("com.graphql-java-kickstart:graphql-java-tools:${Versions.graphQlTools}")
411
}
512

613
tasks.named<io.github.kobylynskyi.graphql.codegen.gradle.GraphQLCodegenGradleTask>("graphqlCodegen") {

dumper-api/build.gradle.kts

+3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@ plugins {
99

1010
micronaut {
1111
version(Versions.micronaut)
12+
runtime("netty")
1213
testRuntime("junit5")
14+
enableNativeImage(false)
1315
processing {
1416
incremental(true)
1517
module(project.name)
@@ -22,6 +24,7 @@ dependencies {
2224
// subprojects
2325
implementation(project(":dumper-data-repositories"))
2426
implementation(project(":dumper-schema"))
27+
implementation(project(":dumper-api-interface"))
2528
testImplementation(project(":dumper-graphql-client"))
2629

2730
// Micronaut

dumper-schema/build.gradle.kts

+3
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,7 @@ plugins {
55
dependencies {
66
// Jambalaya
77
implementation("io.github.expatiat.jambalaya:jambalaya-checks:${Versions.jambalayaChecks}")
8+
9+
// SpotBugs
10+
implementation("com.github.spotbugs:spotbugs-annotations:${Versions.spotbugsAnnotations}")
811
}

gradle.properties

+8-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,13 @@ org.gradle.caching=true
22
org.gradle.daemon=true
33
org.gradle.parallel=true
44
org.gradle.configureondemand=false
5-
org.gradle.jvmargs=-Dfile.encoding=UTF-8 -Duser.timezone=UTC
5+
org.gradle.unsafe.configuration-cache=false
6+
# --illegal-access=permit is a temp flag to fix these issues:
7+
# https://youtrack.jetbrains.com/issue/KT-45545
8+
# https://github.com/n0mer/gradle-git-properties/issues/171
9+
org.gradle.jvmargs=-Dfile.encoding=UTF-8 -Duser.timezone=UTC --illegal-access=permit
610

711
kotlin.stdlib.default.dependency=false
12+
13+
# TODO don't forget to update versions here as well
14+
micronautVersion=2.5.1
+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)