use all instead of bin for the wrapper

jaredsburrows · Jan 26, 2024 · 96fbdec · 96fbdec
1 parent 3969d7d
commit 96fbdec
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 18 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -36,9 +36,13 @@ jobs:
 
       - name: Setup Gradle
         uses: gradle/gradle-build-action@v2.12.0
+      - run: ./gradlew --version
 
-      - name: Run Build
-        run: ./gradlew ktlintCheck build -s
+      - name: Run Ktlint Check On All Sources
+        run: ./gradlew ktlintCheck -s
+
+      - name: Run Build and Unit Tests
+        run: ./gradlew build -s
 
       - name: Publish Test Report
         uses: EnricoMi/publish-unit-test-result-action@v2.12.0

diff --git a/build.gradle b/build.gradle
@@ -16,23 +16,27 @@ plugins {
   id 'groovy'
 }
 
-configurations.configureEach {
-  resolutionStrategy {
-    eachDependency { details ->
-      if (details.requested.group == 'org.jetbrains.kotlin') {
-        details.useVersion libs.versions.kotlin.get()
+allprojects {
+  configurations.configureEach {
+    resolutionStrategy {
+      preferProjectModules()
+
+      enableDependencyVerification()
+
+      eachDependency { details ->
+        if (details.requested.group == 'org.jetbrains.kotlin') {
+          details.useVersion libs.versions.kotlin.get()
+        }
       }
     }
   }
-}
 
-subprojects {
-  repositories {
-    gradlePluginPortal()
-    google()
-    mavenCentral()
+  tasks.withType(Wrapper).configureEach {
+    distributionType = Wrapper.DistributionType.ALL
   }
+}
 
+subprojects {
   tasks.withType(Jar).configureEach {
     def dateFile = new File(buildDir, 'jar-manifest-date.txt')
     if (!dateFile.exists()) {

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-all.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/settings.gradle b/settings.gradle
@@ -1,8 +1,8 @@
 pluginManagement {
   repositories {
-    gradlePluginPortal()
-    google()
     mavenCentral()
+    google()
+    gradlePluginPortal()
   }
 }
 
@@ -14,9 +14,9 @@ dependencyResolutionManagement {
   repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
 
   repositories {
-    gradlePluginPortal()
-    google()
     mavenCentral()
+    google()
+    gradlePluginPortal()
   }
 }