Skip to content

Commit 0a9bdb8

Browse files
author
Dai MIKURUBE
committed
Upgrade the Gradle wrapper to 7.6
Along with that, * Build with the Gradle plugin 0.5.5 * Switch the lockfiles to the modern style * Use the Java toolchain * Move the LICENSE files under META-INF/
1 parent 76ade3c commit 0a9bdb8

File tree

62 files changed

+1104
-665
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+1104
-665
lines changed

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ plugins {
22
id "java"
33
id "java-library"
44
id "maven-publish"
5-
id "org.embulk.embulk-plugins" version "0.4.2" apply false
5+
id "org.embulk.embulk-plugins" version "0.5.5" apply false
66
}
77

88
repositories {

‎embulk-decoder-bzip2/build.gradle‎

Lines changed: 33 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,32 @@ group = rootProject.group
1212
version = rootProject.version
1313
description = "Decodes bzip2 files read by other file input plugins."
1414

15-
sourceCompatibility = 1.8
16-
targetCompatibility = 1.8
15+
configurations {
16+
compileClasspath.resolutionStrategy.activateDependencyLocking()
17+
runtimeClasspath.resolutionStrategy.activateDependencyLocking()
18+
}
19+
20+
tasks.withType(JavaCompile) {
21+
options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation"
22+
options.encoding = "UTF-8"
23+
}
24+
25+
java {
26+
toolchain {
27+
languageVersion = JavaLanguageVersion.of(8)
28+
}
29+
30+
withJavadocJar()
31+
withSourcesJar()
32+
}
1733

1834
dependencies {
1935
compileOnly "org.embulk:embulk-api:0.10.33"
2036
compileOnly "org.embulk:embulk-spi:0.10.33"
2137

22-
compile "org.embulk:embulk-util-config:0.3.1"
23-
compile "org.embulk:embulk-util-file:0.1.3"
24-
compile "org.apache.commons:commons-compress:1.10"
38+
implementation "org.embulk:embulk-util-config:0.3.1"
39+
implementation "org.embulk:embulk-util-file:0.1.3"
40+
implementation "org.apache.commons:commons-compress:1.10"
2541
}
2642

2743
embulkPlugin {
@@ -30,26 +46,25 @@ embulkPlugin {
3046
type = "bzip2"
3147
}
3248

33-
tasks.withType(JavaCompile) {
34-
options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation"
35-
options.encoding = "UTF-8"
36-
}
37-
38-
java {
39-
withJavadocJar()
40-
withSourcesJar()
41-
}
42-
4349
jar {
44-
from rootProject.file("LICENSE")
50+
metaInf {
51+
from rootProject.file("LICENSE")
52+
from rootProject.file("NOTICE")
53+
}
4554
}
4655

4756
sourcesJar {
48-
from rootProject.file("LICENSE")
57+
metaInf {
58+
from rootProject.file("LICENSE")
59+
from rootProject.file("NOTICE")
60+
}
4961
}
5062

5163
javadocJar {
52-
from rootProject.file("LICENSE")
64+
metaInf {
65+
from rootProject.file("LICENSE")
66+
from rootProject.file("NOTICE")
67+
}
5368
}
5469

5570
publishing {

‎embulk-decoder-bzip2/gradle.lockfile‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# This is a Gradle generated file for dependency locking.
2+
# Manual edits can break the build and are not advised.
3+
# This file is expected to be part of source control.
4+
com.fasterxml.jackson.core:jackson-annotations:2.6.7=runtimeClasspath
5+
com.fasterxml.jackson.core:jackson-core:2.6.7=runtimeClasspath
6+
com.fasterxml.jackson.core:jackson-databind:2.6.7=runtimeClasspath
7+
com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.6.7=runtimeClasspath
8+
javax.validation:validation-api:1.1.0.Final=runtimeClasspath
9+
org.apache.commons:commons-compress:1.10=compileClasspath,runtimeClasspath
10+
org.embulk:embulk-api:0.10.33=compileClasspath
11+
org.embulk:embulk-spi:0.10.33=compileClasspath
12+
org.embulk:embulk-util-config:0.3.1=compileClasspath,runtimeClasspath
13+
org.embulk:embulk-util-file:0.1.3=compileClasspath,runtimeClasspath
14+
org.msgpack:msgpack-core:0.8.11=compileClasspath
15+
org.slf4j:slf4j-api:1.7.30=compileClasspath
16+
empty=

‎embulk-decoder-bzip2/gradle/dependency-locks/embulkPluginRuntime.lockfile‎

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

‎embulk-decoder-gzip/build.gradle‎

Lines changed: 32 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,31 @@ group = rootProject.group
1212
version = rootProject.version
1313
description = "Decodes gzip files read by other file input plugins."
1414

15-
sourceCompatibility = 1.8
16-
targetCompatibility = 1.8
15+
configurations {
16+
compileClasspath.resolutionStrategy.activateDependencyLocking()
17+
runtimeClasspath.resolutionStrategy.activateDependencyLocking()
18+
}
19+
20+
tasks.withType(JavaCompile) {
21+
options.compilerArgs << "-Xlint:deprecation" << "-Xlint:unchecked"
22+
options.encoding = "UTF-8"
23+
}
24+
25+
java {
26+
toolchain {
27+
languageVersion = JavaLanguageVersion.of(8)
28+
}
29+
30+
withJavadocJar()
31+
withSourcesJar()
32+
}
1733

1834
dependencies {
1935
compileOnly "org.embulk:embulk-api:0.10.33"
2036
compileOnly "org.embulk:embulk-spi:0.10.33"
2137

22-
compile "org.embulk:embulk-util-config:0.3.1"
23-
compile "org.embulk:embulk-util-file:0.1.3"
38+
implementation "org.embulk:embulk-util-config:0.3.1"
39+
implementation "org.embulk:embulk-util-file:0.1.3"
2440
}
2541

2642
embulkPlugin {
@@ -29,26 +45,25 @@ embulkPlugin {
2945
type = "gzip"
3046
}
3147

32-
tasks.withType(JavaCompile) {
33-
options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation"
34-
options.encoding = "UTF-8"
35-
}
36-
37-
java {
38-
withJavadocJar()
39-
withSourcesJar()
40-
}
41-
4248
jar {
43-
from rootProject.file("LICENSE")
49+
metaInf {
50+
from rootProject.file("LICENSE")
51+
from rootProject.file("NOTICE")
52+
}
4453
}
4554

4655
sourcesJar {
47-
from rootProject.file("LICENSE")
56+
metaInf {
57+
from rootProject.file("LICENSE")
58+
from rootProject.file("NOTICE")
59+
}
4860
}
4961

5062
javadocJar {
51-
from rootProject.file("LICENSE")
63+
metaInf {
64+
from rootProject.file("LICENSE")
65+
from rootProject.file("NOTICE")
66+
}
5267
}
5368

5469
publishing {

‎embulk-decoder-gzip/gradle.lockfile‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# This is a Gradle generated file for dependency locking.
2+
# Manual edits can break the build and are not advised.
3+
# This file is expected to be part of source control.
4+
com.fasterxml.jackson.core:jackson-annotations:2.6.7=runtimeClasspath
5+
com.fasterxml.jackson.core:jackson-core:2.6.7=runtimeClasspath
6+
com.fasterxml.jackson.core:jackson-databind:2.6.7=runtimeClasspath
7+
com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.6.7=runtimeClasspath
8+
javax.validation:validation-api:1.1.0.Final=runtimeClasspath
9+
org.embulk:embulk-api:0.10.33=compileClasspath
10+
org.embulk:embulk-spi:0.10.33=compileClasspath
11+
org.embulk:embulk-util-config:0.3.1=compileClasspath,runtimeClasspath
12+
org.embulk:embulk-util-file:0.1.3=compileClasspath,runtimeClasspath
13+
org.msgpack:msgpack-core:0.8.11=compileClasspath
14+
org.slf4j:slf4j-api:1.7.30=compileClasspath
15+
empty=

‎embulk-decoder-gzip/gradle/dependency-locks/embulkPluginRuntime.lockfile‎

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

‎embulk-encoder-bzip2/build.gradle‎

Lines changed: 33 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,32 @@ group = rootProject.group
1212
version = rootProject.version
1313
description = "Encodes files using bzip2 for other file output plugins."
1414

15-
sourceCompatibility = 1.8
16-
targetCompatibility = 1.8
15+
configurations {
16+
compileClasspath.resolutionStrategy.activateDependencyLocking()
17+
runtimeClasspath.resolutionStrategy.activateDependencyLocking()
18+
}
19+
20+
tasks.withType(JavaCompile) {
21+
options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation"
22+
options.encoding = "UTF-8"
23+
}
24+
25+
java {
26+
toolchain {
27+
languageVersion = JavaLanguageVersion.of(8)
28+
}
29+
30+
withJavadocJar()
31+
withSourcesJar()
32+
}
1733

1834
dependencies {
1935
compileOnly "org.embulk:embulk-api:0.10.33"
2036
compileOnly "org.embulk:embulk-spi:0.10.33"
2137

22-
compile "org.embulk:embulk-util-config:0.3.1"
23-
compile "org.embulk:embulk-util-file:0.1.3"
24-
compile "org.apache.commons:commons-compress:1.10"
38+
implementation "org.embulk:embulk-util-config:0.3.1"
39+
implementation "org.embulk:embulk-util-file:0.1.3"
40+
implementation "org.apache.commons:commons-compress:1.10"
2541
}
2642

2743
embulkPlugin {
@@ -30,26 +46,25 @@ embulkPlugin {
3046
type = "bzip2"
3147
}
3248

33-
tasks.withType(JavaCompile) {
34-
options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation"
35-
options.encoding = "UTF-8"
36-
}
37-
38-
java {
39-
withJavadocJar()
40-
withSourcesJar()
41-
}
42-
4349
jar {
44-
from rootProject.file("LICENSE")
50+
metaInf {
51+
from rootProject.file("LICENSE")
52+
from rootProject.file("NOTICE")
53+
}
4554
}
4655

4756
sourcesJar {
48-
from rootProject.file("LICENSE")
57+
metaInf {
58+
from rootProject.file("LICENSE")
59+
from rootProject.file("NOTICE")
60+
}
4961
}
5062

5163
javadocJar {
52-
from rootProject.file("LICENSE")
64+
metaInf {
65+
from rootProject.file("LICENSE")
66+
from rootProject.file("NOTICE")
67+
}
5368
}
5469

5570
publishing {

‎embulk-encoder-bzip2/gradle.lockfile‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# This is a Gradle generated file for dependency locking.
2+
# Manual edits can break the build and are not advised.
3+
# This file is expected to be part of source control.
4+
com.fasterxml.jackson.core:jackson-annotations:2.6.7=runtimeClasspath
5+
com.fasterxml.jackson.core:jackson-core:2.6.7=runtimeClasspath
6+
com.fasterxml.jackson.core:jackson-databind:2.6.7=runtimeClasspath
7+
com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.6.7=runtimeClasspath
8+
javax.validation:validation-api:1.1.0.Final=runtimeClasspath
9+
org.apache.commons:commons-compress:1.10=compileClasspath,runtimeClasspath
10+
org.embulk:embulk-api:0.10.33=compileClasspath
11+
org.embulk:embulk-spi:0.10.33=compileClasspath
12+
org.embulk:embulk-util-config:0.3.1=compileClasspath,runtimeClasspath
13+
org.embulk:embulk-util-file:0.1.3=compileClasspath,runtimeClasspath
14+
org.msgpack:msgpack-core:0.8.11=compileClasspath
15+
org.slf4j:slf4j-api:1.7.30=compileClasspath
16+
empty=

‎embulk-encoder-bzip2/gradle/dependency-locks/embulkPluginRuntime.lockfile‎

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

0 commit comments

Comments
 (0)