Skip to content

Commit 3610647

Browse files
authored
Merge pull request #5 from rhysdh540/master
updates + configuration cache support
2 parents 3938b95 + 26f3930 commit 3610647

File tree

22 files changed

+101
-284
lines changed

22 files changed

+101
-284
lines changed

build.gradle.kts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
@file:Suppress("HasPlatformType")
22

3-
import xyz.wagyourtail.gradle.shadow.ShadowJar
3+
import xyz.wagyourtail.commons.gradle.shadow.ShadowJar
44
import java.net.URI
55

66
plugins {
77
kotlin("jvm") version "1.9.22"
8+
id("xyz.wagyourtail.commons-gradle") version "1.0.4-SNAPSHOT"
89
`java-gradle-plugin`
910
`maven-publish`
1011
}

buildSrc/build.gradle.kts

Lines changed: 0 additions & 45 deletions
This file was deleted.

buildSrc/src/main/kotlin/xyz/wagyourtail/gradle/shadow/PackageRelocateReader.kt

Lines changed: 0 additions & 64 deletions
This file was deleted.

buildSrc/src/main/kotlin/xyz/wagyourtail/gradle/shadow/PackageRelocator.kt

Lines changed: 0 additions & 16 deletions
This file was deleted.

buildSrc/src/main/kotlin/xyz/wagyourtail/gradle/shadow/ShadowJar.kt

Lines changed: 0 additions & 70 deletions
This file was deleted.

buildSrc/src/main/kotlin/xyz/wagyourtail/gradle/utils/MustSet.kt

Lines changed: 0 additions & 27 deletions
This file was deleted.

expect-platform-test/build.gradle.kts

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,8 @@ val epVersion = projectDir.parentFile.resolve("gradle.properties").readText()
99

1010
buildscript {
1111
repositories {
12+
flatDir { dirs("../build/libs") }
1213
mavenCentral()
13-
flatDir {
14-
dirs("../build/libs")
15-
}
1614
}
1715
dependencies {
1816
if (!project.hasProperty("runningTest")) {
@@ -32,10 +30,8 @@ plugins {
3230
if (project.hasProperty("runningTest")) {
3331
id("xyz.wagyourtail.unimined.expect-platform")
3432
}
35-
3633
}
3734

38-
3935
apply(plugin = "xyz.wagyourtail.unimined.expect-platform")
4036

4137
sourceSets {
@@ -51,6 +47,7 @@ sourceSets {
5147
}
5248

5349
repositories {
50+
mavenLocal()
5451
flatDir {
5552
dirs("../build/libs")
5653
}
@@ -200,5 +197,4 @@ tasks.assemble {
200197
dependsOn(jarA)
201198
dependsOn(jarB)
202199
dependsOn(jarC)
203-
204200
}
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
org.gradle.configuration-cache=true
121 Bytes
Binary file not shown.

expect-platform-test/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

0 commit comments

Comments
 (0)