Skip to content

Commit c95a5ac

Browse files
ChessrayChessray
authored
Merge pull request #28 from mapstruct/gradle-7
Upgraded to Gradle 7.0.2
2 parents 6ffe93d + e881c93 commit c95a5ac

File tree

12 files changed

+113
-78
lines changed

12 files changed

+113
-78
lines changed

‎annotations/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apply plugin: "maven-publish"
22
apply plugin: "signing"
33

44
dependencies {
5-
compileOnly 'org.springframework:spring-core:5.0.0.RELEASE'
5+
implementation libs.spring.core
66
}
77

88
java {

‎build.gradle‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,13 @@ plugins {
1111
id 'jacoco'
1212
id 'maven-publish'
1313
id 'signing'
14-
id "com.github.ben-manes.versions" version "0.36.0"
14+
id "com.github.ben-manes.versions" version "0.38.0"
15+
id "org.springframework.boot" version "2.5.0" apply false
16+
id "io.spring.dependency-management" version "1.0.11.RELEASE" apply false
1517
}
1618

1719
allprojects {
1820
repositories {
19-
jcenter()
2021
mavenCentral()
2122
}
2223
}
@@ -28,11 +29,6 @@ subprojects {
2829
group = 'org.mapstruct.extensions.spring'
2930
version = '0.1.0-SNAPSHOT'
3031

31-
dependencies {
32-
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.7.1'
33-
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.7.1'
34-
}
35-
3632
java {
3733
toolchain {
3834
languageVersion.set(JavaLanguageVersion.of(8))
@@ -59,6 +55,6 @@ subprojects {
5955
}
6056

6157
wrapper {
62-
gradleVersion = '6.8.3'
58+
gradleVersion = '7.0.2'
6359
}
6460

‎examples/classname/build.gradle‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
dependencies {
22
annotationProcessor project(":extensions")
3-
implementation project(":examples:model")
4-
implementation project(":annotations")
5-
// This dependency is used internally, and not exposed to consumers on their own compile classpath.
6-
compileOnly 'javax.annotation:jsr250-api:1.0'
7-
implementation 'org.mapstruct:mapstruct:1.4.0.Final'
8-
annotationProcessor 'org.mapstruct:mapstruct-processor:1.4.0.Final'
9-
implementation 'org.springframework:spring-core:5.0.0.RELEASE'
10-
implementation 'org.springframework:spring-context:5.0.0.RELEASE'
11-
testImplementation 'org.springframework:spring-test:5.0.0.RELEASE'
12-
testImplementation 'org.assertj:assertj-core:3.15.0'
3+
implementation projects.examples.model
4+
implementation projects.annotations
5+
6+
testImplementation libs.assertj
7+
testImplementation libs.bundles.junit.jupiter
8+
implementation libs.jsr250
9+
implementation libs.mapstruct.core
10+
annotationProcessor libs.mapstruct.processor
11+
implementation libs.spring.context
12+
implementation libs.spring.core
13+
testImplementation libs.spring.test
1314
}

‎examples/custom-conversion-service-bean/build.gradle‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
dependencies {
22
annotationProcessor project(":extensions")
3-
implementation project(":examples:model")
4-
implementation project(":annotations")
5-
// This dependency is used internally, and not exposed to consumers on their own compile classpath.
6-
compileOnly 'javax.annotation:jsr250-api:1.0'
7-
implementation 'org.mapstruct:mapstruct:1.4.0.Final'
8-
annotationProcessor 'org.mapstruct:mapstruct-processor:1.4.0.Final'
9-
implementation 'org.springframework:spring-core:5.0.0.RELEASE'
10-
implementation 'org.springframework:spring-context:5.0.0.RELEASE'
11-
testImplementation 'org.springframework:spring-test:5.0.0.RELEASE'
12-
testImplementation 'org.assertj:assertj-core:3.15.0'
3+
implementation projects.examples.model
4+
implementation projects.annotations
5+
6+
testImplementation libs.assertj
7+
testImplementation libs.bundles.junit.jupiter
8+
implementation libs.jsr250
9+
implementation libs.mapstruct.core
10+
annotationProcessor libs.mapstruct.processor
11+
implementation libs.spring.context
12+
implementation libs.spring.core
13+
testImplementation libs.spring.test
1314
}

‎examples/noconfig/build.gradle‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
dependencies {
22
annotationProcessor project(":extensions")
3-
implementation project(":examples:model")
4-
// This dependency is used internally, and not exposed to consumers on their own compile classpath.
5-
compileOnly 'javax.annotation:jsr250-api:1.0'
6-
implementation 'org.mapstruct:mapstruct:1.4.0.Final'
7-
annotationProcessor 'org.mapstruct:mapstruct-processor:1.4.0.Final'
8-
implementation 'org.springframework:spring-core:5.0.0.RELEASE'
9-
implementation 'org.springframework:spring-context:5.0.0.RELEASE'
10-
testImplementation 'org.springframework:spring-test:5.0.0.RELEASE'
11-
testImplementation 'org.assertj:assertj-core:3.15.0'
3+
implementation projects.examples.model
4+
5+
testImplementation libs.assertj
6+
testImplementation libs.bundles.junit.jupiter
7+
implementation libs.jsr250
8+
implementation libs.mapstruct.core
9+
annotationProcessor libs.mapstruct.processor
10+
implementation libs.spring.context
11+
implementation libs.spring.core
12+
testImplementation libs.spring.test
1213
}

‎examples/packagename-and-classname/build.gradle‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
dependencies {
22
annotationProcessor project(":extensions")
3-
implementation project(":examples:model")
4-
implementation project(":annotations")
5-
// This dependency is used internally, and not exposed to consumers on their own compile classpath.
6-
compileOnly 'javax.annotation:jsr250-api:1.0'
7-
implementation 'org.mapstruct:mapstruct:1.4.0.Final'
8-
annotationProcessor 'org.mapstruct:mapstruct-processor:1.4.0.Final'
9-
implementation 'org.springframework:spring-core:5.0.0.RELEASE'
10-
implementation 'org.springframework:spring-context:5.0.0.RELEASE'
11-
testImplementation 'org.springframework:spring-test:5.0.0.RELEASE'
12-
testImplementation 'org.assertj:assertj-core:3.15.0'
3+
implementation projects.examples.model
4+
implementation projects.annotations
5+
6+
testImplementation libs.assertj
7+
testImplementation libs.bundles.junit.jupiter
8+
implementation libs.jsr250
9+
implementation libs.mapstruct.core
10+
annotationProcessor libs.mapstruct.processor
11+
implementation libs.spring.context
12+
implementation libs.spring.core
13+
testImplementation libs.spring.test
1314
}

‎examples/packagename/build.gradle‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
dependencies {
22
annotationProcessor project(":extensions")
3-
implementation project(":annotations")
4-
implementation project(":examples:model")
5-
// This dependency is used internally, and not exposed to consumers on their own compile classpath.
6-
compileOnly 'javax.annotation:jsr250-api:1.0'
7-
implementation 'org.mapstruct:mapstruct:1.4.0.Final'
8-
annotationProcessor 'org.mapstruct:mapstruct-processor:1.4.0.Final'
9-
implementation 'org.springframework:spring-core:5.0.0.RELEASE'
10-
implementation 'org.springframework:spring-context:5.0.0.RELEASE'
11-
testImplementation 'org.springframework:spring-test:5.0.0.RELEASE'
12-
testImplementation 'org.assertj:assertj-core:3.15.0'
3+
implementation projects.examples.model
4+
implementation projects.annotations
5+
6+
testImplementation libs.assertj
7+
testImplementation libs.bundles.junit.jupiter
8+
implementation libs.jsr250
9+
implementation libs.mapstruct.core
10+
annotationProcessor libs.mapstruct.processor
11+
implementation libs.spring.context
12+
implementation libs.spring.core
13+
testImplementation libs.spring.test
1314
}

‎examples/simple-springboot/build.gradle‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
1-
plugins {
2-
id "org.springframework.boot" version "2.4.4"
3-
id "io.spring.dependency-management" version "1.0.11.RELEASE"
4-
}
1+
apply plugin: "org.springframework.boot"
2+
apply plugin: "io.spring.dependency-management"
53

64
dependencies {
75
annotationProcessor project(":extensions")
8-
implementation project(":examples:model")
9-
implementation project(":annotations")
6+
implementation projects.examples.model
7+
implementation projects.annotations
108

11-
implementation 'org.mapstruct:mapstruct:1.4.0.Final'
12-
annotationProcessor 'org.mapstruct:mapstruct-processor:1.4.0.Final'
13-
implementation 'org.springframework.boot:spring-boot-starter'
14-
testImplementation 'org.springframework.boot:spring-boot-starter-test:2.4.4'
9+
implementation libs.mapstruct.core
10+
annotationProcessor libs.mapstruct.processor
11+
implementation libs.spring.boot.starter.core
12+
testImplementation libs.spring.boot.starter.test
1513
}

‎extensions/build.gradle‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,17 @@ apply plugin: "maven-publish"
22
apply plugin: "signing"
33

44
dependencies {
5-
implementation project(":annotations")
6-
implementation 'com.squareup:javapoet:1.13.0'
7-
implementation 'org.apache.commons:commons-lang3:3.11'
5+
implementation projects.annotations
6+
implementation libs.javapoet
7+
implementation libs.commons.lang3
88

9-
testImplementation 'org.mapstruct:mapstruct:1.4.0.Final'
10-
testImplementation 'org.assertj:assertj-core:3.19.0'
11-
testImplementation 'commons-io:commons-io:2.8.0'
12-
testImplementation 'com.google.guava:guava:30.1-jre'
13-
testImplementation 'org.mockito:mockito-junit-jupiter:3.8.0'
14-
testImplementation 'org.springframework:spring-core:5.0.0.RELEASE'
9+
testImplementation libs.assertj
10+
testImplementation libs.bundles.junit.jupiter
11+
testImplementation libs.commons.io
12+
testImplementation libs.guava
13+
testImplementation libs.mapstruct.core
14+
testImplementation libs.mockito
15+
testImplementation libs.spring.core
1516
}
1617

1718
java {

‎gradle/libs.versions.toml‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
[versions]
2+
assertj = "3.19.0"
3+
commons-io = "2.8.0"
4+
commons-lang3 = "3.12.0"
5+
guava = "30.1.1-jre"
6+
javapoet = "1.13.0"
7+
jsr250 = "1.0"
8+
jupiter = "5.7.2"
9+
mapstruct = "1.4.0.Final"
10+
mockito = "3.10.0"
11+
spring = "5.0.0.RELEASE"
12+
13+
[libraries]
14+
assertj = { group = "org.assertj", name = "assertj-core", version.ref = "assertj"}
15+
commons-io = { group = "commons-io", name = "commons-io", version.ref = "commons-io" }
16+
commons-lang3 = { group = "org.apache.commons", name = "commons-lang3", version.ref = "commons-lang3" }
17+
guava = { group = "com.google.guava", name = "guava", version.ref = "guava" }
18+
javapoet = { group = "com.squareup", name = "javapoet", version.ref = "javapoet"}
19+
jsr250 = { group = "javax.annotation", name = "jsr250-api", version.ref = "jsr250" }
20+
junit-jupiter-api = { group = "org.junit.jupiter", name = "junit-jupiter-api", version.ref = "jupiter" }
21+
junit-jupiter-engine = { group = "org.junit.jupiter", name = "junit-jupiter-engine", version.ref = "jupiter" }
22+
junit-jupiter-params = { group = "org.junit.jupiter", name = "junit-jupiter-params", version.ref = "jupiter" }
23+
mapstruct-core = { group = "org.mapstruct", name = "mapstruct", version.ref = "mapstruct" }
24+
mapstruct-processor = { group = "org.mapstruct", name = "mapstruct-processor", version.ref = "mapstruct" }
25+
mockito = { group = "org.mockito", name = "mockito-junit-jupiter", version.ref = "mockito" }
26+
spring-boot-starter-core = { group = "org.springframework.boot", name = "spring-boot-starter" }
27+
spring-boot-starter-test = { group = "org.springframework.boot", name = "spring-boot-starter-test" }
28+
spring-context = { group = "org.springframework", name = "spring-context", version.ref = "spring" }
29+
spring-core = { group = "org.springframework", name = "spring-core", version.ref = "spring" }
30+
spring-test = { group = "org.springframework", name = "spring-test", version.ref = "spring" }
31+
32+
[bundles]
33+
junit-jupiter = ["junit-jupiter-api", "junit-jupiter-engine", "junit-jupiter-params"]

0 commit comments

Comments
 (0)