Skip to content

Commit 518123d

Browse files
h908714124h908714124
committed
prepare kts
prefer double quoted strings https://developer.android.com/build/migrate-to-kotlin-dsl
1 parent 6c72b62 commit 518123d

File tree

3 files changed

+93
-94
lines changed

3 files changed

+93
-94
lines changed

‎compiler/build.gradle‎

Lines changed: 45 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,26 @@
11
plugins {
2-
id('java')
3-
id('maven-publish')
4-
id('com.gradleup.shadow') version('8.3.6')
5-
id('signing')
2+
id("java")
3+
id("maven-publish")
4+
id("com.gradleup.shadow") version("8.3.6")
5+
id("signing")
66
}
77

8-
group = 'io.github.jbock-java'
8+
group = "io.github.jbock-java"
99

1010
compileJava {
11-
options.encoding = 'UTF-8'
12-
sourceCompatibility = '11'
13-
targetCompatibility = '11'
11+
options.encoding = "UTF-8"
12+
sourceCompatibility = "11"
13+
targetCompatibility = "11"
1414
}
1515

1616
javadoc {
17-
options.encoding = 'UTF-8'
17+
options.encoding = "UTF-8"
1818
}
1919

2020
repositories {
2121
mavenCentral()
2222
}
2323

24-
shadowJar {
25-
minimize()
26-
archiveClassifier.set('')
27-
}
28-
2924
tasks.withType(AbstractArchiveTask).configureEach {
3025
preserveFileTimestamps = false
3126
reproducibleFileOrder = true
@@ -37,33 +32,33 @@ tasks.withType(GenerateModuleMetadata).configureEach {
3732

3833
shadowJar {
3934
minimize()
40-
archiveClassifier.set('')
41-
relocate('io.jbock.auto.common', 'io.jbock.jbock.auto.common')
42-
relocate('io.jbock.javapoet', 'io.jbock.jbock.javapoet')
35+
archiveClassifier.set("")
36+
relocate("io.jbock.auto.common", "io.jbock.jbock.auto.common")
37+
relocate("io.jbock.javapoet", "io.jbock.jbock.javapoet")
4338
}
4439

4540
dependencies {
46-
def jbock = project(':jbock')
47-
def simple_component = 'io.github.jbock-java:simple-component:1.024'
48-
def javapoet = 'io.github.jbock-java:javapoet:1.15'
41+
def jbock = project(":jbock")
42+
def simple_component = "io.github.jbock-java:simple-component:1.024"
43+
def javapoet = "io.github.jbock-java:javapoet:1.15"
4944
implementation(javapoet)
50-
implementation('io.github.jbock-java:auto-common:1.2.3')
45+
implementation("io.github.jbock-java:auto-common:1.2.3")
5146
shadow(jbock)
5247
compileOnly(simple_component)
53-
annotationProcessor('io.github.jbock-java:simple-component-compiler:1.024')
54-
testRuntimeOnly('org.junit.platform:junit-platform-launcher')
55-
testImplementation('io.github.jbock-java:compile-testing:0.19.12')
56-
testImplementation platform('org.junit:junit-bom:5.12.2')
57-
testImplementation('org.junit.jupiter:junit-jupiter')
58-
testImplementation('org.mockito:mockito-core:5.16.1')
48+
annotationProcessor("io.github.jbock-java:simple-component-compiler:1.024")
49+
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
50+
testImplementation("io.github.jbock-java:compile-testing:0.19.12")
51+
testImplementation platform("org.junit:junit-bom:5.12.2")
52+
testImplementation("org.junit.jupiter:junit-jupiter")
53+
testImplementation("org.mockito:mockito-core:5.16.1")
5954
testImplementation(jbock)
6055
testImplementation(simple_component)
6156
}
6257

6358
jar {
6459
manifest {
6560
attributes(
66-
'Implementation-Version': project.properties['version']
61+
"Implementation-Version": project.properties["version"]
6762
)
6863
}
6964
}
@@ -72,14 +67,14 @@ test {
7267
useJUnitPlatform()
7368
}
7469

75-
tasks.register('javadocJar', Jar) {
70+
tasks.register("javadocJar", Jar) {
7671
from javadoc
77-
archiveClassifier.set('javadoc')
72+
archiveClassifier.set("javadoc")
7873
}
7974

80-
tasks.register('sourcesJar', Jar) {
75+
tasks.register("sourcesJar", Jar) {
8176
from sourceSets.main.allJava
82-
archiveClassifier.set('sources')
77+
archiveClassifier.set("sources")
8378
}
8479

8580
artifacts {
@@ -91,53 +86,53 @@ publishing {
9186
publications {
9287
shadow(MavenPublication) { publication ->
9388
project.shadow.component(publication)
94-
artifactId = 'jbock-compiler'
89+
artifactId = "jbock-compiler"
9590

9691
artifact sourcesJar
9792
artifact javadocJar
9893

9994
pom {
100-
name = 'jbock-compiler'
101-
packaging = 'jar'
102-
description = 'jbock annotation processor'
103-
url = 'https://github.com/jbock-java/jbock'
95+
name = "jbock-compiler"
96+
packaging = "jar"
97+
description = "jbock annotation processor"
98+
url = "https://github.com/jbock-java/jbock"
10499

105100
licenses {
106101
license {
107-
name = 'MIT License'
108-
url = 'https://opensource.org/licenses/MIT'
102+
name = "MIT License"
103+
url = "https://opensource.org/licenses/MIT"
109104
}
110105
}
111106
developers {
112107
developer {
113-
id = 'Various'
114-
name = 'Various'
115-
email = 'jbock-java@gmx.de'
108+
id = "Various"
109+
name = "Various"
110+
email = "jbock-java@gmx.de"
116111
}
117112
}
118113
scm {
119-
connection = 'scm:git:https://github.com/jbock-java/jbock.git'
120-
developerConnection = 'scm:git:https://github.com/jbock-java/jbock.git'
121-
url = 'https://github.com/jbock-java/jbock'
114+
connection = "scm:git:https://github.com/jbock-java/jbock.git"
115+
developerConnection = "scm:git:https://github.com/jbock-java/jbock.git"
116+
url = "https://github.com/jbock-java/jbock"
122117
}
123118
}
124119
}
125120
}
126121
repositories {
127122
maven {
128-
url = 'https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/'
123+
url = "https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/"
129124
credentials {
130-
username = System.getenv('OSS_USER')
131-
password = System.getenv('OSS_PASS')
125+
username = System.getenv("OSS_USER")
126+
password = System.getenv("OSS_PASS")
132127
}
133128
}
134129
}
135130
}
136131

137132
// https://docs.gradle.org/current/userguide/signing_plugin.html
138133
signing {
139-
def signingKey = findProperty('signingKey')
140-
def signingPassword = findProperty('signingPassword')
134+
def signingKey = findProperty("signingKey")
135+
def signingPassword = findProperty("signingPassword")
141136
useInMemoryPgpKeys(signingKey, signingPassword)
142137
sign publishing.publications.shadow
143138
}

‎examples/build.gradle‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
plugins {
2-
id 'java'
2+
id "java"
33
}
44

55
repositories {
66
mavenCentral()
77
}
88

99
compileJava {
10-
options.encoding = 'UTF-8'
11-
sourceCompatibility = '17'
12-
targetCompatibility = '17'
10+
options.encoding = "UTF-8"
11+
sourceCompatibility = "17"
12+
targetCompatibility = "17"
1313
}
1414

1515
dependencies {
16-
def jbock = project(':jbock')
16+
def jbock = project(":jbock")
1717
implementation(jbock)
18-
annotationProcessor project(':compiler')
19-
annotationProcessor project(':jbock')
20-
testImplementation platform('org.junit:junit-bom:5.12.2')
21-
testImplementation('org.junit.jupiter:junit-jupiter')
22-
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
18+
annotationProcessor project(":compiler")
19+
annotationProcessor project(":jbock")
20+
testImplementation platform("org.junit:junit-bom:5.12.2")
21+
testImplementation("org.junit.jupiter:junit-jupiter")
22+
testRuntimeOnly "org.junit.platform:junit-platform-launcher"
2323
}
2424

2525
test {

‎jbock/build.gradle‎

Lines changed: 38 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,19 @@
11
plugins {
2-
id('java-library')
3-
id('maven-publish')
4-
id('signing')
2+
id("java-library")
3+
id("maven-publish")
4+
id("signing")
55
}
66

7-
group = 'io.github.jbock-java'
7+
group = "io.github.jbock-java"
88

99
compileJava {
10-
options.encoding = 'UTF-8'
11-
sourceCompatibility = '11'
12-
targetCompatibility = '11'
10+
options.encoding = "UTF-8"
11+
sourceCompatibility = "11"
12+
targetCompatibility = "11"
13+
}
14+
15+
javadoc {
16+
options.encoding = "UTF-8"
1317
}
1418

1519
repositories {
@@ -26,16 +30,16 @@ tasks.withType(GenerateModuleMetadata) {
2630
}
2731

2832
dependencies {
29-
api('io.github.jbock-java:either:1.5.2')
30-
testImplementation platform('org.junit:junit-bom:5.12.2')
31-
testImplementation('org.junit.jupiter:junit-jupiter')
32-
testImplementation('org.mockito:mockito-core:5.16.1')
33+
api("io.github.jbock-java:either:1.5.2")
34+
testImplementation platform("org.junit:junit-bom:5.12.2")
35+
testImplementation("org.junit.jupiter:junit-jupiter")
36+
testImplementation("org.mockito:mockito-core:5.16.1")
3337
}
3438

3539
jar {
3640
manifest {
3741
attributes(
38-
'Implementation-Version': project.properties['version']
42+
"Implementation-Version": project.properties["version"]
3943
)
4044
}
4145
}
@@ -44,14 +48,14 @@ test {
4448
useJUnitPlatform()
4549
}
4650

47-
task javadocJar(type: Jar) {
51+
tasks.register("javadocJar", Jar) {
4852
from javadoc
49-
archiveClassifier.set('javadoc')
53+
archiveClassifier.set("javadoc")
5054
}
5155

52-
task sourcesJar(type: Jar) {
56+
tasks.register("sourcesJar", Jar) {
5357
from sourceSets.main.allJava
54-
archiveClassifier.set('sources')
58+
archiveClassifier.set("sources")
5559
}
5660

5761
artifacts {
@@ -62,54 +66,54 @@ artifacts {
6266
publishing {
6367
publications {
6468
mavenJava(MavenPublication) {
65-
artifactId = 'jbock'
69+
artifactId = "jbock"
6670
from components.java
6771

6872
artifact sourcesJar
6973
artifact javadocJar
7074

7175
pom {
72-
name = 'jbock'
73-
packaging = 'jar'
74-
description = 'jbock annotations and utils'
75-
url = 'https://github.com/jbock-java/jbock'
76+
name = "jbock"
77+
packaging = "jar"
78+
description = "jbock annotations and utils"
79+
url = "https://github.com/jbock-java/jbock"
7680

7781
licenses {
7882
license {
79-
name = 'MIT License'
80-
url = 'https://opensource.org/licenses/MIT'
83+
name = "MIT License"
84+
url = "https://opensource.org/licenses/MIT"
8185
}
8286
}
8387
developers {
8488
developer {
85-
id = 'Various'
86-
name = 'Various'
87-
email = 'jbock-java@gmx.de'
89+
id = "Various"
90+
name = "Various"
91+
email = "jbock-java@gmx.de"
8892
}
8993
}
9094
scm {
91-
connection = 'scm:git:https://github.com/jbock-java/jbock.git'
92-
developerConnection = 'scm:git:https://github.com/jbock-java/jbock.git'
93-
url = 'https://github.com/jbock-java/jbock'
95+
connection = "scm:git:https://github.com/jbock-java/jbock.git"
96+
developerConnection = "scm:git:https://github.com/jbock-java/jbock.git"
97+
url = "https://github.com/jbock-java/jbock"
9498
}
9599
}
96100
}
97101
}
98102
repositories {
99103
maven {
100-
url = 'https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/'
104+
url = "https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/"
101105
credentials {
102-
username = System.getenv('OSS_USER')
103-
password = System.getenv('OSS_PASS')
106+
username = System.getenv("OSS_USER")
107+
password = System.getenv("OSS_PASS")
104108
}
105109
}
106110
}
107111
}
108112

109113
// https://docs.gradle.org/current/userguide/signing_plugin.html
110114
signing {
111-
def signingKey = findProperty('signingKey')
112-
def signingPassword = findProperty('signingPassword')
115+
def signingKey = findProperty("signingKey")
116+
def signingPassword = findProperty("signingPassword")
113117
useInMemoryPgpKeys(signingKey, signingPassword)
114118
sign publishing.publications.mavenJava
115119
}

0 commit comments

Comments
 (0)