Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP/Testing] Test Module Issue #7146

Closed
wants to merge 24 commits into from
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
ad08080
Add apache commons
DominikVoigt Nov 30, 2020
29445a9
Add apache commons to module-info.java
DominikVoigt Nov 30, 2020
db5f2c5
Add further entries to module info
DominikVoigt Nov 30, 2020
53c6f36
try with disable system modules
Siedlerchr Nov 30, 2020
10a733f
Add mainModule
Siedlerchr Nov 30, 2020
bbd4556
revert
Siedlerchr Dec 6, 2020
39f7935
Merge remote-tracking branch 'upstream/master' into test-module-issue
Siedlerchr Dec 6, 2020
2872cbe
Merge remote-tracking branch 'upstream/master' into test-module-issue
DominikVoigt Dec 6, 2020
eecde6e
Merge branch 'test-module-issue' of https://github.com/JabRef/jabref …
DominikVoigt Dec 6, 2020
8aee951
try with jackson now
Siedlerchr Dec 7, 2020
bb88fb2
Merge remote-tracking branch 'upstream/master' into test-module-issue
Siedlerchr Dec 21, 2020
9abace1
Merge remote-tracking branch 'upstream/master' into test-module-issue
Siedlerchr Dec 21, 2020
41d9e5c
test with 16-ea
Siedlerchr Dec 21, 2020
146b5a1
try upgrading gradle
Siedlerchr Jan 1, 2021
b4249ba
Merge branch 'updateGradle7' into test-module-issue
Siedlerchr Jan 1, 2021
05a4b5a
Upgrade to java 16
Siedlerchr Jan 1, 2021
06715a8
add tollchain to 16
Siedlerchr Jan 1, 2021
6c572ff
downgrade
Siedlerchr Jan 1, 2021
85a5bc4
downgrade back to 15
Siedlerchr Jan 1, 2021
e04995b
downgrade
Siedlerchr Jan 1, 2021
849984c
remove swing
Siedlerchr Jan 1, 2021
3d4082c
add swing
Siedlerchr Jan 1, 2021
0ca4304
use javafx plugin again
Siedlerchr Jan 1, 2021
4508044
Merge remote-tracking branch 'upstream/master' into test-module-issue
Siedlerchr Jan 10, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
try upgrading gradle
  • Loading branch information
Siedlerchr committed Jan 1, 2021
commit 146b5a14de299ef77bdfe06a4adaaa118a3f4f24
14 changes: 9 additions & 5 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ plugins {
id 'me.champeau.gradle.jmh' version '0.5.2'
id 'com.github.ben-manes.versions' version '0.36.0'
id 'org.javamodularity.moduleplugin' version '1.7.0'
id 'org.openjfx.javafxplugin' version '0.0.9'
// id 'org.openjfx.javafxplugin' version '0.0.9'
id 'org.beryx.jlink' version '2.23.1'
// nicer test outputs during running and completion
// Homepage: https://github.com/radarsh/gradle-test-logger-plugin
Expand All @@ -38,11 +38,13 @@ version = project.findProperty('projVersion') ?: '100.0.0'
java {
sourceCompatibility = JavaVersion.VERSION_14
targetCompatibility = JavaVersion.VERSION_14

}

application {
mainClassName = "org.jabref.gui.JabRefLauncher"
}
modularity.disableEffectiveArgumentsAdjustment()

// TODO: Ugly workaround to temporarily ignore build errors to dependencies of latex2unicode
// These should be removed, as well as the files in the lib folder, as soon as they have valid module names
Expand Down Expand Up @@ -87,10 +89,6 @@ configurations {
}
}

javafx {
version = "15"
modules = [ 'javafx.controls', 'javafx.fxml', 'javafx.web', 'javafx.swing' ]
}

dependencies {
// Include all jar-files in the 'lib' folder as dependencies
Expand Down Expand Up @@ -145,6 +143,12 @@ dependencies {
implementation group: 'jakarta.annotation', name: 'jakarta.annotation-api', version: '1.3.5'

// JavaFX stuff

// https://mvnrepository.com/artifact/org.openjfx/javafx-controls
implementation group: 'org.openjfx', name: 'javafx-controls', version: '15.0.1'
implementation group: 'org.openjfx', name: 'javafx-fxml', version: '15.0.1'
implementation group: 'org.openjfx', name: 'javafx-web', version: '15.0.1'

implementation 'de.jensd:fontawesomefx-commons:11.0'
implementation 'de.jensd:fontawesomefx-materialdesignfont:1.7.22-11'
implementation 'de.saxsys:mvvmfx-validation:1.9.0-SNAPSHOT'
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
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\:https://services.gradle.org/distributions/gradle-6.5-bin.zip
distributionUrl=https\:https://services.gradle.org/distributions/gradle-6.7.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
2 changes: 1 addition & 1 deletion gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ fi
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`

JAVACMD=`cygpath --unix "$JAVACMD"`

# We build the pattern for arguments to be converted via cygpath
Expand Down
21 changes: 18 additions & 3 deletions gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome

set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if "%ERRORLEVEL%" == "0" goto execute
if "%ERRORLEVEL%" == "0" goto init

echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Expand All @@ -54,7 +54,7 @@ goto fail
set JAVA_HOME=%JAVA_HOME:"=%
set JAVA_EXE=%JAVA_HOME%/bin/java.exe

if exist "%JAVA_EXE%" goto execute
if exist "%JAVA_EXE%" goto init

echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
Expand All @@ -64,14 +64,29 @@ echo location of your Java installation.

goto fail

:init
@rem Get command-line arguments, handling Windows variants

if not "%OS%" == "Windows_NT" goto win9xME_args

:win9xME_args
@rem Slurp the command line arguments.
set CMD_LINE_ARGS=
set _SKIP=2

:win9xME_args_slurp
if "x%~1" == "x" goto execute

set CMD_LINE_ARGS=%*

:execute
@rem Setup the command line

set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar


@rem Execute Gradle
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%

:end
@rem End local scope for the variables with windows NT shell
Expand Down