Skip to content

Commit

Permalink
Upgrade to Gradle 7
Browse files Browse the repository at this point in the history
  • Loading branch information
hedgehog1029 committed Apr 26, 2022
1 parent 8e1337d commit 54c05d1
Show file tree
Hide file tree
Showing 7 changed files with 59 additions and 47 deletions.
21 changes: 6 additions & 15 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,16 +1,5 @@
buildscript {
repositories {
mavenCentral()
jcenter()
}

dependencies {
classpath "com.github.jengelman.gradle.plugins:shadow:2.0.1"
}
}

plugins {
id "com.github.johnrengelman.shadow" version "4.0.4"
id "com.github.johnrengelman.shadow" version "7.1.2"
id 'io.freefair.lombok' version '5.3.0'
}

Expand All @@ -24,13 +13,15 @@ println """

subprojects {
apply plugin: 'java'
apply plugin: 'maven'

group = 'com.skcraft'
version = '4.6-SNAPSHOT'

sourceCompatibility = 1.8
targetCompatibility = 1.8
java {
toolchain {
languageVersion.set(JavaLanguageVersion.of(8))
}
}

repositories {
mavenCentral()
Expand Down
16 changes: 9 additions & 7 deletions creator-tools/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ plugins {
}

version = "2.1.0-SNAPSHOT"
sourceCompatibility = 1.8
targetCompatibility = 1.8

mainClassName = "com.skcraft.launcher.creator.Creator"
application {
mainClassName = "com.skcraft.launcher.creator.Creator"
}

dependencies {
compile project(':launcher-builder')
compile 'org.eclipse.jetty:jetty-server:9.3.1.v20150714'
compile 'com.jidesoft:jide-oss:3.6.10'
implementation project(':launcher-builder')
implementation 'org.eclipse.jetty:jetty-server:9.3.1.v20150714'
implementation 'com.jidesoft:jide-oss:3.6.18'
}

processResources {
Expand All @@ -27,4 +27,6 @@ processResources {
shadowJar {
}

build.dependsOn(shadowJar)
build {
dependsOn(shadowJar)
}
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
12 changes: 8 additions & 4 deletions launcher-bootstrap/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,13 @@ plugins {
id 'io.freefair.lombok'
}

mainClassName = "com.skcraft.launcher.Bootstrap"
application {
mainClassName = "com.skcraft.launcher.Bootstrap"
}

dependencies {
compile 'com.googlecode.json-simple:json-simple:1.1.1'
compile 'javax.xml.bind:jaxb-api:2.3.0'
implementation 'com.googlecode.json-simple:json-simple:1.1.1'
implementation 'javax.xml.bind:jaxb-api:2.3.0'
}

processResources {
Expand All @@ -22,4 +24,6 @@ processResources {
shadowJar {
}

build.dependsOn(shadowJar)
build {
dependsOn(shadowJar)
}
15 changes: 10 additions & 5 deletions launcher-builder/build.gradle
Original file line number Diff line number Diff line change
@@ -1,18 +1,23 @@
plugins {
id 'application'
id 'java-library'
id "com.github.johnrengelman.shadow"
id 'io.freefair.lombok'
}

mainClassName = "com.skcraft.launcher.builder.PackageBuilder"
application {
mainClassName = "com.skcraft.launcher.builder.PackageBuilder"
}

dependencies {
compile project(':launcher')
compile 'org.tukaani:xz:1.0'
compile 'org.apache.commons:commons-compress:1.9'
api project(':launcher')
implementation 'org.tukaani:xz:1.0'
implementation 'org.apache.commons:commons-compress:1.9'
}

shadowJar {
}

build.dependsOn(shadowJar)
build {
dependsOn(shadowJar)
}
12 changes: 8 additions & 4 deletions launcher-fancy/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@ plugins {
id 'io.freefair.lombok'
}

mainClassName = "com.skcraft.launcher.FancyLauncher"
application {
mainClassName = "com.skcraft.launcher.FancyLauncher"
}

repositories {
maven {
Expand All @@ -14,11 +16,13 @@ repositories {
}

dependencies {
compile project(':launcher')
compile 'io.github.cottonmc.insubstantial:substance:7.3.1-SNAPSHOT'
implementation project(':launcher')
implementation 'io.github.cottonmc.insubstantial:substance:7.3.1-SNAPSHOT'
}

shadowJar {
}

build.dependsOn(shadowJar)
build {
dependsOn(shadowJar)
}
28 changes: 17 additions & 11 deletions launcher/build.gradle
Original file line number Diff line number Diff line change
@@ -1,21 +1,25 @@
plugins {
id 'application'
id 'java-library'
id "com.github.johnrengelman.shadow"
id 'io.freefair.lombok'
}

mainClassName = "com.skcraft.launcher.Launcher"
application {
mainClassName = "com.skcraft.launcher.Launcher"
}

dependencies {
compile 'javax.xml.bind:jaxb-api:2.2.4'
compile 'com.fasterxml.jackson.core:jackson-databind:2.3.0'
compile 'commons-lang:commons-lang:2.6'
compile 'commons-io:commons-io:1.2'
compile 'com.google.guava:guava:15.0'
compile 'com.beust:jcommander:1.32'
compile 'com.miglayout:miglayout:3.7.4'
compile 'com.google.code.findbugs:jsr305:3.0.0'
compile 'com.googlecode.plist:dd-plist:1.23'
api 'javax.xml.bind:jaxb-api:2.2.4'
api 'com.fasterxml.jackson.core:jackson-databind:2.3.0'
api 'commons-lang:commons-lang:2.6'
api 'commons-io:commons-io:1.2'
api 'com.google.guava:guava:15.0'
api 'com.beust:jcommander:1.32'
api 'com.miglayout:miglayout:3.7.4'
api 'com.google.code.findbugs:jsr305:3.0.0'

implementation 'com.googlecode.plist:dd-plist:1.23'

implementation 'net.java.dev.jna:jna-platform:5.10.0'
}
Expand All @@ -31,4 +35,6 @@ processResources {
shadowJar {
}

build.dependsOn(shadowJar)
build {
dependsOn(shadowJar)
}

0 comments on commit 54c05d1

Please sign in to comment.