refactor

build.gradle

@@ -1,31 +1,34 @@
 plugins {
-    id 'java-library'
+    id 'maven-publish'
+    id 'net.woggioni.plugins.multi-release-jar'
+    id 'net.woggioni.gradle.lombok'
 }
 
 group = "net.woggioni"
 
 repositories {
-    mavenLocal()
     mavenCentral()
-    jcenter()
+    maven {
+        url = 'https://mvn.woggioni.net/'
+    }
+}
+
+lombok {
+    version = getProperty('lombok.version')
 }
 
 dependencies {
-    compileOnly group: "org.projectlombok", name: "lombok", version: lombokVersion
+    implementation group: 'net.woggioni', name: 'jwo', version: getProperty('jwo.version')
-    annotationProcessor group: "org.projectlombok", name: "lombok", version: lombokVersion
 
-    implementation group: 'net.woggioni', name: 'jwo', version: jwoVersion
+    testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: getProperty('junit.jupiter.version')
-
+    testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: getProperty('junit.jupiter.version')
-    testCompileOnly group: "org.projectlombok", name: "lombok", version: lombokVersion
-    testAnnotationProcessor group: "org.projectlombok", name: "lombok", version: lombokVersion
-    testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: junitJupiterVersion
-    testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: junitJupiterVersion
 }
 
 java {
-    modularity.inferModulePath = true
     sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_11
+    withJavadocJar()
+    withSourcesJar()
 }
 
 compileTestJava {
@@ -36,3 +39,20 @@ test {
     useJUnitPlatform()
 }
 
+publishing {
+    repositories {
+        maven {
+            url = 'https://mvn.woggioni.net/'
+        }
+    }
+    publications {
+        maven(MavenPublication) {
+            from(components["java"])
+        }
+    }
+}
+
+wrapper {
+    distributionType = Wrapper.DistributionType.BIN
+    gradleVersion = getProperty('gradle.version')
+}

gradle.properties

@@ -1,4 +1,5 @@
-jwoVersion=1.0
+gradle.version = 7.1.1
-junitJupiterVersion=5.7.0
+jwo.version=1.0
-lombokVersion=1.18.16
+junit.jupiter.version=5.7.2
-slf4jVersion=1.7.30
+lombok.version=1.18.16
+slf4j.version=1.7.32

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -72,7 +72,7 @@ case "`uname`" in
   Darwin* )
     darwin=true
     ;;
-  MINGW* )
+  MSYS* | MINGW* )
     msys=true
     ;;
   NONSTOP* )

settings.gradle

@@ -1 +1,16 @@
+pluginManagement {
+    repositories {
+        mavenLocal()
+        maven {
+            url = 'https://woggioni.net/mvn/'
+        }
+        gradlePluginPortal()
+    }
+
+    plugins {
+        id "net.woggioni.gradle.lombok" version "0.1"
+        id "net.woggioni.plugins.multi-release-jar" version "0.1"
+    }
+}
+
 rootProject.name = 'wdi'

src/main/java/net/woggioni/wdi/Bean.java

@@ -1,4 +1,4 @@
-package net.woggioni.wdi.api;
+package net.woggioni.wdi;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

src/main/java/net/woggioni/wdi/BeanClasses.java

@@ -1,4 +1,4 @@
-package net.woggioni.wdi.api;
+package net.woggioni.wdi;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

src/main/java/net/woggioni/wdi/BeanConfigurationException.java

@@ -1,4 +1,4 @@
-package net.woggioni.wdi.api;
+package net.woggioni.wdi;
 
 public class BeanConfigurationException extends RuntimeException {
     public BeanConfigurationException(String msg) {

src/main/java/net/woggioni/wdi/BeanContainer.java

@@ -1,4 +1,4 @@
-package net.woggioni.wdi.api;
+package net.woggioni.wdi;
 
 import lombok.AccessLevel;
 import lombok.RequiredArgsConstructor;

src/main/java/net/woggioni/wdi/BeanFactory.java

@@ -1,4 +1,4 @@
-package net.woggioni.wdi.api;
+package net.woggioni.wdi;
 
 import java.util.Collections;
 

src/main/java/net/woggioni/wdi/BeanSpec.java

@@ -1,4 +1,4 @@
-package net.woggioni.wdi.api;
+package net.woggioni.wdi;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;

src/main/java/net/woggioni/wdi/Import.java

@@ -1,4 +1,4 @@
-package net.woggioni.wdi.api;
+package net.woggioni.wdi;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

src/main/java/net/woggioni/wdi/ParentIterator.java

@@ -1,9 +1,12 @@
-package net.woggioni.wdi.api;
+package net.woggioni.wdi;
 
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
 import net.woggioni.jwo.JWO;
 
-import java.util.*;
-
 class ParentIterator implements Iterator<Class<?>> {
 
     static Class<?>[] superClasses(Class<?> cls) {

src/main/java/net/woggioni/wdi/Qualifier.java

@@ -1,4 +1,4 @@
-package net.woggioni.wdi.api;
+package net.woggioni.wdi;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

src/main/java/net/woggioni/wdi/Startup.java

@@ -1,4 +1,4 @@
-package net.woggioni.wdi.api;
+package net.woggioni.wdi;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

src/main/java9/module-info.java

@@ -0,0 +1,3 @@
+module net.woggioni.wdi {
+    exports net.woggioni.wdi;
+}

src/test/java/net/woggioni/wdi/BeanContainerTest.java

@@ -1,4 +1,4 @@
-package net.woggioni.wdi.api;
+package net.woggioni.wdi;
 
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;

src/test/java/net/woggioni/wdi/ParentIteratorTest.java

@@ -1,4 +1,4 @@
-package net.woggioni.wdi.api;
+package net.woggioni.wdi;
 
 import net.woggioni.jwo.CollectionUtils;
 import net.woggioni.jwo.JWO;