diff --git a/gradle-6/.gitignore b/gradle-6/.gitignore index 75efe642c0..6987887957 100644 --- a/gradle-6/.gitignore +++ b/gradle-6/.gitignore @@ -2,7 +2,7 @@ # Gradle .gradle -/build/ +build # Ignore Gradle GUI config gradle-app.setting diff --git a/gradle-6/build.gradle.kts b/gradle-6/build.gradle.kts index d9876dfe28..fb3c3f88a2 100644 --- a/gradle-6/build.gradle.kts +++ b/gradle-6/build.gradle.kts @@ -1,42 +1,5 @@ -plugins { - `java-library` - `maven-publish` -} - -group = "com.baeldung" -version = "1.0.0" - -repositories { - mavenCentral() -} - -dependencies { - api("io.reactivex.rxjava2:rxjava:2.2.16") - implementation("com.google.guava:guava") { - version { - require("2.0") - prefer("28.1-jre") - because("Only uses ImmutableList type, so any version since 2.0 will do, but tested with 28.1-jre") - } - } - - testImplementation("org.junit.jupiter:junit-jupiter-api:5.5.2") - testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.5.2") -} - -tasks.compileJava { - sourceCompatibility = "1.8" - targetCompatibility = "1.8" -} - -tasks.test { - useJUnitPlatform() -} - -publishing { - publications { - register("mavenJava") { - from(components["java"]) - } +subprojects { + repositories { + mavenCentral() } } \ No newline at end of file diff --git a/gradle-6/dependency-constraints/build.gradle.kts b/gradle-6/dependency-constraints/build.gradle.kts new file mode 100644 index 0000000000..41336d3c91 --- /dev/null +++ b/gradle-6/dependency-constraints/build.gradle.kts @@ -0,0 +1,29 @@ +plugins { + `java-library` +} + +group = "com.baeldung" +version = "1.0.0" + +dependencies { + api("io.reactivex.rxjava2:rxjava:2.2.16") + implementation("com.google.guava:guava") { + version { + require("10.0") + prefer("28.1-jre") + because("Only uses ImmutableList type, so any version since 2.0 will do, but tested with 28.1-jre") + } + } + + testImplementation("org.junit.jupiter:junit-jupiter-api:5.5.2") + testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.5.2") +} + +tasks.compileJava { + sourceCompatibility = "1.8" + targetCompatibility = "1.8" +} + +tasks.test { + useJUnitPlatform() +} diff --git a/gradle-6/src/main/java/com/baeldung/gradle/RxHelloWorld.java b/gradle-6/dependency-constraints/src/main/java/com/baeldung/gradle/RxHelloWorld.java similarity index 100% rename from gradle-6/src/main/java/com/baeldung/gradle/RxHelloWorld.java rename to gradle-6/dependency-constraints/src/main/java/com/baeldung/gradle/RxHelloWorld.java diff --git a/gradle-6/src/test/java/com/baeldung/gradle/RxHelloWorldUnitTest.java b/gradle-6/dependency-constraints/src/test/java/com/baeldung/gradle/RxHelloWorldUnitTest.java similarity index 100% rename from gradle-6/src/test/java/com/baeldung/gradle/RxHelloWorldUnitTest.java rename to gradle-6/dependency-constraints/src/test/java/com/baeldung/gradle/RxHelloWorldUnitTest.java diff --git a/gradle-6/httpclient-platform/build.gradle.kts b/gradle-6/httpclient-platform/build.gradle.kts new file mode 100644 index 0000000000..a021bff013 --- /dev/null +++ b/gradle-6/httpclient-platform/build.gradle.kts @@ -0,0 +1,11 @@ +plugins { + `java-platform` +} + +dependencies { + constraints { + api("org.apache.httpcomponents:fluent-hc:4.5.10") + api("org.apache.httpcomponents:httpclient:4.5.10") + runtime("commons-logging:commons-logging:1.2") + } +} \ No newline at end of file diff --git a/gradle-6/module-metadata-publishing/build.gradle.kts b/gradle-6/module-metadata-publishing/build.gradle.kts new file mode 100644 index 0000000000..9812c72f6f --- /dev/null +++ b/gradle-6/module-metadata-publishing/build.gradle.kts @@ -0,0 +1,12 @@ +plugins { + java + `maven-publish` +} + +publishing { + publications { + register("mavenJava") { + from(components["java"]) + } + } +} \ No newline at end of file diff --git a/gradle-6/person-rest-client/build.gradle.kts b/gradle-6/person-rest-client/build.gradle.kts new file mode 100644 index 0000000000..c562b3e164 --- /dev/null +++ b/gradle-6/person-rest-client/build.gradle.kts @@ -0,0 +1,8 @@ +plugins { + `java-library` +} + +dependencies { + api(platform(project(":httpclient-platform"))) + implementation("org.apache.httpcomponents:fluent-hc") +} \ No newline at end of file diff --git a/gradle-6/settings.gradle.kts b/gradle-6/settings.gradle.kts index 8866408745..d84d0ff54e 100644 --- a/gradle-6/settings.gradle.kts +++ b/gradle-6/settings.gradle.kts @@ -1 +1,7 @@ rootProject.name = "gradle-6" + +include("dependency-constraints") +include("httpclient-platform") +include("module-metadata-publishing") +include("person-rest-client") +include("widget-rest-client") \ No newline at end of file diff --git a/gradle-6/widget-rest-client/build.gradle.kts b/gradle-6/widget-rest-client/build.gradle.kts new file mode 100644 index 0000000000..e1af4b7f71 --- /dev/null +++ b/gradle-6/widget-rest-client/build.gradle.kts @@ -0,0 +1,8 @@ +plugins { + `java-library` +} + +dependencies { + api(platform(project(":httpclient-platform"))) + implementation("org.apache.httpcomponents:httpclient") +} \ No newline at end of file