diff --git a/build.gradle b/build.gradle index dabcb9d..c9481df 100644 --- a/build.gradle +++ b/build.gradle @@ -43,7 +43,6 @@ java { } compileJava { - options.release = 8 options.compilerArgs << '-parameters' } diff --git a/gradle.properties b/gradle.properties index a2b48a7..8948059 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,10 @@ -gradle.version=7.3.3 -wdi.version=1.0 -jwo.version=1.0 -junit.jupiter.version=5.7.2 -lombok.version=1.18.22 -slf4j.version=1.7.32 \ No newline at end of file +gradle.version=7.5.1 +lombok.gradle.plugin.version=2022.06 +multi-release-jar.gradle.plugin.version=2022.06 +envelope.gradle.plugin.version=2022.08 + +wdi.version=1.0=SNAPSHOT +jwo.version=1.0-SNAPSHOT +junit.jupiter.version=5.9.0 +lombok.version=1.18.24 +slf4j.version=2.0.0 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2e6e589..ae04661 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/settings.gradle b/settings.gradle index 8fb081b..5b8f6d0 100644 --- a/settings.gradle +++ b/settings.gradle @@ -7,9 +7,9 @@ pluginManagement { } plugins { - id "net.woggioni.gradle.lombok" version "0.1" - id "net.woggioni.gradle.multi-release-jar" version "0.1" - id "net.woggioni.gradle.envelope" version "0.1" + id "net.woggioni.gradle.lombok" version getProperty('lombok.gradle.plugin.version') + id "net.woggioni.gradle.multi-release-jar" version getProperty('multi-release-jar.gradle.plugin.version') + id "net.woggioni.gradle.envelope" version getProperty('envelope.gradle.plugin.version') } } diff --git a/src/main/java/net/woggioni/wdi/BeanContainer.java b/src/main/java/net/woggioni/wdi/BeanContainer.java index 85a2d18..4bab07c 100644 --- a/src/main/java/net/woggioni/wdi/BeanContainer.java +++ b/src/main/java/net/woggioni/wdi/BeanContainer.java @@ -5,12 +5,30 @@ import lombok.RequiredArgsConstructor; import lombok.SneakyThrows; import net.woggioni.jwo.CollectionUtils; import net.woggioni.jwo.JWO; +import net.woggioni.jwo.Tuple2; import java.lang.annotation.Annotation; -import java.lang.reflect.*; -import java.util.*; +import java.lang.reflect.AnnotatedElement; +import java.lang.reflect.Constructor; +import java.lang.reflect.Executable; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; +import java.lang.reflect.Parameter; +import java.util.AbstractMap; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.NavigableMap; +import java.util.NavigableSet; +import java.util.Objects; +import java.util.Optional; +import java.util.TreeMap; +import java.util.TreeSet; import java.util.function.BiConsumer; -import net.woggioni.jwo.Tuple2; @RequiredArgsConstructor(access = AccessLevel.PRIVATE) public class BeanContainer {