60 lines
1.9 KiB
Diff
60 lines
1.9 KiB
Diff
From cd59e4ba58cf36038558421e38509d6ad125da2b Mon Sep 17 00:00:00 2001
|
|
From: Andras Fuchs <andras.fuchs@gmail.com>
|
|
Date: Thu, 25 Nov 2021 23:44:08 +0100
|
|
Subject: [PATCH] Upgrade Gradle to v7.3
|
|
|
|
---
|
|
build.gradle | 4 ++--
|
|
gradle/wrapper/gradle-wrapper.properties | 2 +-
|
|
src/main/java/module-info.java | 10 +++++-----
|
|
3 files changed, 8 insertions(+), 8 deletions(-)
|
|
|
|
diff --git a/build.gradle b/build.gradle
|
|
index fadfda4..9daba09 100644
|
|
--- a/build.gradle
|
|
+++ b/build.gradle
|
|
@@ -24,7 +24,7 @@ plugins {
|
|
ext.mainClassName = 'eu.mihosoft.freerouting.gui.MainApplication'
|
|
|
|
wrapper {
|
|
- gradleVersion = '6.2'
|
|
+ gradleVersion = '7.3'
|
|
}
|
|
|
|
sourceCompatibility = '11'
|
|
@@ -160,7 +160,7 @@ dist.dependsOn+="assemble"
|
|
task run(type: JavaExec) {
|
|
classpath = sourceSets.main.runtimeClasspath
|
|
|
|
- main = mainClassName
|
|
+ mainClass = mainClassName
|
|
|
|
// arguments to pass to the application
|
|
// args 'appArg1'
|
|
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
|
|
index b7c8c5d..e750102 100644
|
|
--- a/gradle/wrapper/gradle-wrapper.properties
|
|
+++ b/gradle/wrapper/gradle-wrapper.properties
|
|
@@ -1,5 +1,5 @@
|
|
distributionBase=GRADLE_USER_HOME
|
|
distributionPath=wrapper/dists
|
|
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.2-bin.zip
|
|
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
|
|
zipStoreBase=GRADLE_USER_HOME
|
|
zipStorePath=wrapper/dists
|
|
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
|
|
index fede9df..d165817 100644
|
|
--- a/src/main/java/module-info.java
|
|
+++ b/src/main/java/module-info.java
|
|
@@ -1,5 +1,5 @@
|
|
-//module eu.mihosoft.freerouting {
|
|
-// requires java.desktop;
|
|
-// requires java.logging;
|
|
-// requires eu.mihosoft.freerouting.deps.jh;
|
|
-//}
|
|
+module eu.mihosoft.freerouting {
|
|
+ requires java.desktop;
|
|
+ requires java.logging;
|
|
+ requires org.apache.logging.log4j;
|
|
+}
|