Skip to content

Commit 98862f2

Browse files
committed
Updated Gradle to 9.x
1 parent 91a8072 commit 98862f2

File tree

5 files changed

+258
-164
lines changed

5 files changed

+258
-164
lines changed

build.gradle

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
apply plugin: "java"
22

3-
version '1.0'
3+
version = '1.0'
44

55
sourceSets.main.java.srcDirs = ["src"]
66

77
repositories{
88
mavenCentral()
9-
maven{ url "https://raw.githubusercontent.com/Zelaux/MindustryRepo/master/repository" }
10-
maven{ url 'https://www.jitpack.io' }
9+
maven{ url = "https://raw.githubusercontent.com/Zelaux/MindustryRepo/master/repository" }
10+
maven{ url = 'https://www.jitpack.io' }
1111
}
1212

1313
java{
@@ -26,8 +26,10 @@ ext{
2626

2727
//java 8 backwards compatibility flag
2828
allprojects{
29-
tasks.withType(JavaCompile){
30-
options.compilerArgs.addAll(['--release', '8'])
29+
tasks.withType(JavaCompile).tap{
30+
configureEach{
31+
options.compilerArgs.addAll(['--release', '8'])
32+
}
3133
}
3234
}
3335

@@ -39,21 +41,21 @@ dependencies{
3941
}
4042

4143
//force arc version
42-
configurations.all{
44+
configurations.configureEach{
4345
resolutionStrategy.eachDependency { details ->
4446
if(details.requested.group == 'com.github.Anuken.Arc'){
4547
details.useVersion "$mindustryVersion"
4648
}
4749
}
4850
}
4951

50-
task jarAndroid{
52+
tasks.register('jarAndroid'){
5153
dependsOn "jar"
5254

5355
doLast{
54-
if(!sdkRoot || !new File(sdkRoot).exists()) throw new GradleException("No valid Android SDK found. Ensure that ANDROID_HOME is set to your Android SDK directory.");
56+
if(!sdkRoot || !new File(sdkRoot).exists()) throw new GradleException("No valid Android SDK found. Ensure that ANDROID_HOME is set to your Android SDK directory.")
5557

56-
def platformRoot = new File("$sdkRoot/platforms/").listFiles().sort().reverse().find{ f -> new File(f, "android.jar").exists()}
58+
def platformRoot = new File("$sdkRoot/platforms/").listFiles().sort().reverse().find{ f -> new File(f, "android.jar").exists() }
5759

5860
if(!platformRoot) throw new GradleException("No android.jar found. Ensure that you have an Android platform installed.")
5961

@@ -63,13 +65,13 @@ task jarAndroid{
6365
def d8 = isWindows ? "d8.bat" : "d8"
6466

6567
//dex and desugar files - this requires d8 in your PATH
66-
"$d8 $dependencies --min-api 14 --output ${project.archivesBaseName}Android.jar ${project.archivesBaseName}Desktop.jar"
67-
.execute(null, new File("$buildDir/libs")).waitForProcessOutput(System.out, System.err)
68+
"$d8 $dependencies --min-api 14 --output ${project.name}Android.jar ${project.name}Desktop.jar"
69+
.execute(null, new File("$layout.buildDirectory/libs")).waitForProcessOutput(System.out, System.err)
6870
}
6971
}
7072

7173
jar{
72-
archiveFileName = "${base.archivesBaseName}Desktop.jar"
74+
archiveFileName = "${project.name}Desktop.jar"
7375

7476
from{
7577
configurations.runtimeClasspath.collect{ it.isDirectory() ? it : zipTree(it) }
@@ -84,17 +86,17 @@ jar{
8486
}
8587
}
8688

87-
task deploy(type: Jar){
89+
tasks.register('deploy', Jar){
8890
dependsOn jarAndroid
8991
dependsOn jar
90-
archiveFileName = "${base.archivesBaseName}.jar"
92+
archiveFileName = "${project.name}.jar"
9193

92-
from{ [zipTree("$buildDir/libs/${project.archivesBaseName}Desktop.jar"), zipTree("$buildDir/libs/${project.archivesBaseName}Android.jar")] }
94+
from{ [zipTree("$layout.buildDirectory/libs/${project.name}Desktop.jar"), zipTree("$layout.buildDirectory/libs/${project.name}Android.jar")] }
9395

9496
doLast{
9597
delete{
96-
delete "$buildDir/libs/${project.archivesBaseName}Desktop.jar"
97-
delete "$buildDir/libs/${project.archivesBaseName}Android.jar"
98+
delete "$layout.buildDirectory/libs/${project.name}Desktop.jar"
99+
delete "$layout.buildDirectory/libs/${project.name}Android.jar"
98100
}
99101
}
100102
}

gradle/wrapper/gradle-wrapper.jar

-12.3 KB
Binary file not shown.
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
4+
networkTimeout=10000
5+
validateDistributionUrl=true
46
zipStoreBase=GRADLE_USER_HOME
57
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)