Skip to content

Commit 555213a

Browse files
committed
Merge remote-tracking branch 'origin/feature'
# Conflicts: # jOOL-java-8/build.gradle # jOOL-java-8/src/main/java/org/jooq/lambda/Either.java # jOOL-java-8/src/main/java/org/jooq/lambda/Loops.java # jOOL-java-8/src/main/java/org/jooq/lambda/Seq.java # jOOL-java-8/src/main/java/org/jooq/lambda/Wrap.java # jOOL/build.gradle # jOOL/pom.xml # jOOL/src/main/java/org/jooq/lambda/Blocking.java # jOOL/src/main/java/org/jooq/lambda/Either.java # jOOL/src/main/java/org/jooq/lambda/Loops.java # jOOL/src/main/java/org/jooq/lambda/Seq.java # jOOL/src/main/java/org/jooq/lambda/Unchecked.java # jOOL/src/main/java/org/jooq/lambda/WindowImpl.java # jOOL/src/main/java/org/jooq/lambda/Wrap.java # jOOL/src/test/java/org/jooq/lambda/BlockingTest.java # jOOL/src/test/java/org/jooq/lambda/CheckedBiConsumerTest.java # jOOL/src/test/java/org/jooq/lambda/CheckedBiFunctionTest.java # jOOL/src/test/java/org/jooq/lambda/CheckedBiPredicateTest.java # jOOL/src/test/java/org/jooq/lambda/CheckedBinaryOperatorTest.java # jOOL/src/test/java/org/jooq/lambda/CheckedComparatorTest.java # jOOL/src/test/java/org/jooq/lambda/CheckedConsumerTest.java # jOOL/src/test/java/org/jooq/lambda/CheckedFunctionTest.java # jOOL/src/test/java/org/jooq/lambda/CheckedPredicateTest.java # jOOL/src/test/java/org/jooq/lambda/CheckedRunnableTest.java # jOOL/src/test/java/org/jooq/lambda/CheckedSupplierTest.java # jOOL/src/test/java/org/jooq/lambda/CheckedUnaryOperatorTest.java # jOOL/src/test/java/org/jooq/lambda/ConsumerTest.java # jOOL/src/test/java/org/jooq/lambda/Example.java # jOOL/src/test/java/org/jooq/lambda/TupleTest.java
2 parents d3c6cb0 + 029139c commit 555213a

File tree

91 files changed

+14157
-656
lines changed

Some content is hidden

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

91 files changed

+14157
-656
lines changed

jOOL-java-8/build.gradle

Lines changed: 22 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,13 @@ plugins {
22
id 'java-library'
33
id 'idea'
44
id 'maven-publish'
5-
id "net.ltgt.errorprone" version "2.+"
6-
//id "org.checkerframework" version "+"
7-
//id 'io.franzbecker.gradle-lombok' version "5.+"
5+
//id 'net.ltgt.errorprone' version '+'
6+
//id 'org.checkerframework' version '+'
7+
//id 'io.franzbecker.gradle-lombok' version '+'
88
}
99

1010
repositories {
11+
mavenLocal()
1112
mavenCentral()
1213
}
1314

@@ -20,30 +21,28 @@ java {
2021

2122
javadoc {
2223
options.encoding = 'UTF-8'
23-
if(JavaVersion.current().isJava9Compatible()) {
24-
options.addBooleanOption('html5', true)
25-
}
2624
}
2725

2826
gradle.projectsEvaluated {
2927
tasks.withType(JavaCompile).configureEach {
3028
options.encoding = 'UTF-8'
3129
options.compilerArgs.addAll(['-Xlint:all', '-parameters', '-g', '-Xmaxwarns', '999'])
32-
//options.release = 8 // javac --release 8
30+
//options.release.set(8) // javac --release 7..18+ (instead of toolchain)
3331
options.deprecation = true
34-
options.annotationProcessorPath = configurations.errorprone
32+
// options.annotationProcessorPath = configurations.errorprone
3533

36-
options.errorprone {
37-
enabled = false
38-
disableWarningsInGeneratedCode = true
39-
excludedPaths = ".*/build/gen.*/.*"
40-
//disable("ParameterName") disable("UnusedVariable") errorproneArgs = ["--illegal-access=warn"]
41-
}
34+
// options.errorprone {
35+
// enabled = true // <<<!!! You can disable Error-Prone here!
36+
// disableWarningsInGeneratedCode = true
37+
// excludedPaths = ".*/build/gen.*/.*"
38+
// //disable("ParameterName") disable("UnusedVariable") errorproneArgs = ["--illegal-access=warn"]
39+
// errorproneArgs = ["-XepExcludedPaths:.*/test/.*"]
40+
// }
4241
}
4342
}
4443

4544
publishing {
46-
publications {
45+
publications { // artifactId = folder name
4746
maven(MavenPublication) {
4847
from components.java
4948
}
@@ -52,23 +51,27 @@ publishing {
5251
tasks.withType(GenerateModuleMetadata) {
5352
enabled = false // don't generate Gradle's json metadata
5453
}
55-
54+
// generate -src and -javadoc .jars
5655
// https://docs.gradle.org/current/userguide/publishing_maven.html
5756
java {
5857
withSourcesJar()
5958
withJavadocJar()
6059
}
6160

6261
dependencies {
63-
errorprone "com.google.errorprone:error_prone_core:latest.release"
64-
62+
// errorprone "com.google.errorprone:error_prone_core:latest.release"
6563
//implementation 'org.checkerframework:checker-qual:3.+'
66-
//implementation 'org.slf4j:slf4j-api:1.7.+'
6764

6865
testImplementation 'junit:junit:4.+'
6966
//testImplementation 'org.mockito:mockito-inline:+'
7067
//testImplementation "com.google.truth:truth:+"
7168
//testImplementation "com.google.truth.extensions:truth-java8-extension:+"
69+
70+
testRuntimeOnly 'org.slf4j:slf4j-api:2.+'
71+
testRuntimeOnly 'org.slf4j:slf4j-simple:2.+'
72+
73+
testRuntimeOnly 'org.apache.logging.log4j:log4j-api:2.+'
74+
testRuntimeOnly 'org.apache.logging.log4j:log4j-core:2.+'
7275
}
7376

7477
idea {

jOOL-java-8/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
<groupId>org.jooq</groupId>
1414
<artifactId>jool-java-8</artifactId>
15-
<version>0.9.14</version>
15+
<version>0.9.15</version>
1616
<packaging>bundle</packaging>
1717

1818
<name>jOOL</name>

jOOL-java-8/src/main/java/org/jooq/lambda/Blocking.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@
2828
*/
2929
public final class Blocking {
3030

31+
@SuppressWarnings("ReturnValueIgnored")
32+
// Error Prone shows error: [ReturnValueIgnored] Return value of 'get' must be used → .get()
3133
public static Runnable runnable(Runnable runnable) {
3234
return () -> supplier(() -> { runnable.run(); return null; }).get();
3335
}

0 commit comments

Comments
 (0)