Undo some Gradle configuration after ratpack#1639

pravasna · Apr 25, 2022 · 012fa29 · 012fa29
1 parent 375632f
commit 012fa29
Show file tree

Hide file tree

Showing 14 changed files with 5 additions and 107 deletions.
diff --git a/buildSrc/buildSrc.gradle b/buildSrc/buildSrc.gradle
@@ -41,6 +41,3 @@ sourceSets {
   }
 }
 
-processResources {
-  duplicatesStrategy(DuplicatesStrategy.EXCLUDE)
-}
diff --git a/gradle/versionFile.gradle b/gradle/versionFile.gradle
@@ -41,10 +41,3 @@ sourceSets {
     }
   }
 }
-
-// Add implicit dependency due to https://github.com/gradle/gradle/issues/18563
-//tasks.withType(Jar) { Jar task ->
-//  if (task.name == "sourcesJar") {
-//    task.from(tasks.named("writeVersionNumberFile"))
-//  }
-//}
diff --git a/ratpack-groovy/ratpack-groovy.gradle b/ratpack-groovy/ratpack-groovy.gradle
@@ -53,6 +53,6 @@ sourceSets {
 }
 
 // Add implicit dependency due to https://github.com/gradle/gradle/issues/18563
-tasks.named("sourcesJar").configure {
-  it.from(tasks.named("processResources"))
-}
+//tasks.named("sourcesJar").configure {
+//  it.from(tasks.named("processResources"))
+//}
diff --git a/ratpack-manual/ratpack-manual.gradle b/ratpack-manual/ratpack-manual.gradle
@@ -136,7 +136,7 @@ task api(type: Javadoc) {
   configure(options) {
     splitIndex true
     use = true
-    links "http://docs.oracle.com/javase/8/docs/api/"
+    links "https://docs.oracle.com/javase/8/docs/api/"
     windowTitle "Ratpack API ($project.version)"
     docTitle "Ratpack API ($project.version)"
     header = ext.additionalAssets
@@ -361,7 +361,6 @@ task stylizeManual(type: Sync) {
       from(source)
     }
   }
-  duplicatesStrategy(DuplicatesStrategy.EXCLUDE)
 }
 
 task packageManual(type: Sync) {

diff --git a/ratpack-manual/src/assets/images/martini.png b/ratpack-manual/src/assets/images/martini.png
diff --git a/ratpack-manual/src/assets/images/martini.svg b/ratpack-manual/src/assets/images/martini.svg
diff --git a/ratpack-manual/src/assets/images/ratpack-logo-small.png b/ratpack-manual/src/assets/images/ratpack-logo-small.png
diff --git a/ratpack-manual/src/assets/images/ratpack-logo.png b/ratpack-manual/src/assets/images/ratpack-logo.png
diff --git a/ratpack-site/ratpack-site.gradle b/ratpack-site/ratpack-site.gradle
@@ -271,7 +271,6 @@ processTestResources.dependsOn writeTestConfig
 
 processResources {
   inputs.files configurations.latestManual
-  duplicatesStrategy(DuplicatesStrategy.EXCLUDE)
   into "manual/" + version - "-SNAPSHOT", {
     from { zipTree(configurations.latestManual.singleFile) }
   }
@@ -321,7 +320,6 @@ distributions.main.contents {
 distTar {
   compression = Compression.GZIP
   archiveVersion.set(null)
-  duplicatesStrategy(DuplicatesStrategy.EXCLUDE)
 }
 
 run.ext.set("ratpack.flattenClassloaders", true)

diff --git a/...e/src/ratpack/public/learning-ratpack.jpg → ...te/src/assets/images/learning-ratpack.jpg b/...e/src/ratpack/public/learning-ratpack.jpg → ...te/src/assets/images/learning-ratpack.jpg
diff --git a/ratpack-site/src/main/groovy/ratpack/site/SiteMain.java b/ratpack-site/src/main/groovy/ratpack/site/SiteMain.java
@@ -71,7 +71,7 @@ public static void main(String... args) throws Exception {
               //noinspection ConstantConditions
               String host = ctx.getRequest().getHeaders().get("host");
               if (host != null && (host.endsWith("ratpack-framework.org") || host.equals("www.ratpack.io"))) {
-                ctx.redirect(301, "http://ratpack.io" + ctx.getRequest().getRawUri());
+                ctx.redirect(301, "https://ratpack.io" + ctx.getRequest().getRawUri());
                 return;
               }
 

diff --git a/ratpack-site/src/newrelic/agent.jar b/ratpack-site/src/newrelic/agent.jar
diff --git a/ratpack-site/src/ratpack/public/apple-touch-icon-precomposed.png b/ratpack-site/src/ratpack/public/apple-touch-icon-precomposed.png
diff --git a/ratpack-site/src/ratpack/public/favicon.ico b/ratpack-site/src/ratpack/public/favicon.ico
-Original file line number
+Diff line change
@@ Expand Up / @@ -41,6 +41,3 @@ sourceSets { @@
       }
     }
-    processResources {
-      duplicatesStrategy(DuplicatesStrategy.EXCLUDE)
-    }