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

Feature reduce deps #3807

Merged
merged 5 commits into from
Jan 3, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
53 changes: 28 additions & 25 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ runtime {
'jdk.xml.dom',
'jdk.crypto.cryptoki',
'jdk.crypto.ec'
]
]



Expand Down Expand Up @@ -288,9 +288,6 @@ repositories {
dependencies {
implementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.15.0'
implementation group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.15.0'
implementation group: 'org.apache.logging.log4j', name: 'log4j-1.2-api', version: '2.15.0' // Bridges v1 to v2 for other code in other libs
implementation group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.36'
implementation group: 'commons-logging', name: 'commons-logging', version: '1.2'

// Image processing lib
implementation group: 'com.twelvemonkeys.imageio', name: 'imageio-core', version: '3.8.2' // https://mvnrepository.com/artifact/com.twelvemonkeys.imageio/imageio-core
Expand All @@ -300,27 +297,28 @@ dependencies {
implementation group: 'com.twelvemonkeys.imageio', name: 'imageio-batik', version: '3.8.2'
implementation group: 'com.twelvemonkeys.imageio', name: 'imageio-tga', version: '3.8.2'
implementation group: 'com.twelvemonkeys.imageio', name: 'imageio-bmp', version: '3.8.2'

implementation 'org.apache.xmlgraphics:batik-all:1.14' // For Twelvemonkey SVG
// For Twelvemonkey SVG
implementation 'org.apache.xmlgraphics:batik-all:1.14'


// For Sentry bug reporting
implementation group: 'io.sentry', name: 'sentry', version: '1.7.29'
implementation group: 'io.sentry', name: 'sentry-log4j2', version: '1.7.29'

implementation group: 'org.apache.commons', name: 'commons-collections4', version: '4.4'
// parsing of configuration data
implementation group: 'org.apache.commons', name: 'commons-configuration2', version: '2.7'

implementation 'commons-beanutils:commons-beanutils:1.9.4'
implementation 'commons-io:commons-io:2.11.0'
implementation 'commons-jxpath:commons-jxpath:1.3'
implementation 'commons-lang:commons-lang:2.6'
// ftp client
implementation 'commons-net:commons-net:3.8.0'
// commandline parsing
implementation 'commons-cli:commons-cli:1.4'

// RPTool Libs
// default ressources (token, textures etc.)
implementation 'com.github.RPTools:maptool-resources:1.6.0'
// parser for macros
implementation 'com.github.RPTools:parser:1.8.3'
// dice expressions
implementation 'net.rptools.dicelib:dicelib:1.8.6'

// Currently hosted on nerps.net/repo
Expand All @@ -333,6 +331,7 @@ dependencies {
implementation group: 'com.jidesoft', name: 'jide-properties', version: '3.7.9'
implementation group: 'com.jidesoft', name: 'jide-shortcut', version: '3.7.9'

// webserver for old webapp that is scheduled for removal
implementation 'org.eclipse.jetty:jetty-server:9.4.42.v20210604'
implementation 'org.eclipse.jetty:jetty-servlet:9.4.42.v20210604'
implementation 'org.eclipse.jetty:jetty-webapp:9.4.42.v20210604'
Expand All @@ -342,26 +341,35 @@ dependencies {
implementation 'org.eclipse.jetty.websocket:websocket-servlet:9.4.42.v20210604'
implementation 'org.eclipse.jetty.websocket:websocket-api:9.4.42.v20210604'

implementation 'net.sf.ezmorph:ezmorph:1.0.6'

// old json lib only used for one macro function. Use gson instead
implementation 'net.sf.json-lib:json-lib:2.4:jdk15'

implementation 'org.hibernate:antlr:2.7.5H3'
// utils for handling reflection
implementation 'org.reflections:reflections:0.9.11'
implementation 'org.mozilla:rhino:1.7.12'
implementation 'ca.odell.renderpack:renderpack:1.2004'

// find running instances in LAN
implementation 'net.tsc.servicediscovery:servicediscovery:1.0.b5'

//maybe replace with jupnp
implementation 'net.sbbi.upnp:upnplib:1.0.9-nodebug'
implementation 'xmlpull:xmlpull:1.1.3.1'
implementation 'xpp3:xpp3_min:1.1.4c'
implementation 'com.thoughtworks.xstream:xstream:1.4.19'

// custom binding stuff, should probably be replace with Beans Binding (JSR 295)
implementation 'yasb:yasb:0.2-21012007'

implementation 'de.muntjak.tinylookandfeel:tinylaf-nocp:1.4.0'

// serialize to and from xml
implementation 'com.thoughtworks.xstream:xstream:1.4.19'

// themes
implementation 'com.formdev:flatlaf:2.4'
implementation 'com.formdev:flatlaf-intellij-themes:2.4'
implementation 'com.formdev:flatlaf-extras:2.4'
implementation 'com.formdev:svgSalamander:1.1.3'
implementation 'com.formdev:flatlaf-jide-oss:2.4'

// JS support for macros
implementation group: 'org.graalvm.js', name: 'js', version: '21.2.0'
implementation group: 'org.graalvm.js', name: 'js-scriptengine', version: '21.1.0'

Expand Down Expand Up @@ -395,11 +403,6 @@ dependencies {
// Better JSON functions...
implementation group: 'com.google.code.gson', name: 'gson', version: '2.9.0' // https://mvnrepository.com/artifact/com.google.code.gson/gson

// Declare the dependency for your favourite test framework you want to use in your tests.
// TestNG is also supported by the Gradle Test task. Just change the
// testimplementation dependency to testimplementation 'org.testng:testng:6.8.1' and add
// 'test.useTestNG()' to your build script.
//testCompile 'junit:junit:4.12'
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2'
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.2'

Expand Down Expand Up @@ -439,7 +442,7 @@ dependencies {
implementation 'org.jsoup:jsoup:1.14.3'
// eventbus
implementation 'com.google.guava:guava:31.0.1-jre'
// message compression
// compression of messages between client and server
implementation 'org.apache.commons:commons-compress:1.22'
implementation 'org.tukaani:xz:1.9'
// intellij forms runtime
Expand Down Expand Up @@ -538,7 +541,7 @@ test {
}

task createWrapper(type: Wrapper) {
gradleVersion = '6.3'
gradleVersion = '7.6'
}

// Configure current release tag in Sentry.io properties
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\://services.gradle.org/distributions/gradle-7.3.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading