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.

Sign up for GitHub

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

Bump js from 21.2.0 to 22.1.0.1 #47

Closed
wants to merge 1 commit into from
Closed

Bump js from 21.2.0 to 22.1.0.1 #47

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
75 changes: 30 additions & 45 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.17'
classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.18'
}
}

Expand All @@ -18,7 +18,7 @@ plugins {
id "org.ajoberstar.grgit" version "4.1.0"
id "com.diffplug.spotless" version "5.14.3"
id 'org.openjfx.javafxplugin' version '0.0.10'
id 'org.beryx.runtime' version '1.12.5'
id 'org.beryx.runtime' version '1.12.7'
id "com.google.protobuf" version "0.8.17"
}

Expand All @@ -32,10 +32,10 @@ apply plugin: 'com.google.protobuf'

// Definitions
defaultTasks 'clean', 'build'
sourceCompatibility = 16
targetCompatibility = 16
sourceCompatibility = 17
targetCompatibility = 17
def grpcVersion = '1.39.0'
def protobufVersion = '3.17.3'
def protobufVersion = '3.20.0'
def protocVersion = protobufVersion


Expand Down Expand Up @@ -103,18 +103,9 @@ spotless {
target project.fileTree(project.rootDir) {
include 'src/**/*.java'
exclude '**/JTextAreaAppender.java'
exclude '**/TransferableHelper.java' // Temporary until switch expression is supported.
exclude '**/MapToolInfo.java' // Temporary until supported.
exclude '**/PlayerDatabaseInfo.java' // Temporary until supported.
exclude '**/PlayerInfo.java' // Temporary until supported.
exclude '**/PlayTimeInfo.java' // Temporary until supported.
exclude '**/NoData.java' // Temporary until supported.
exclude '**/PlayTime.java' // Temporary until supported.
exclude '**/CipherUtil.java' // Temporary until supported.
}
licenseHeaderFile 'spotless.license.java'


// Now using the Google Java style guide
googleJavaFormat()
}
Expand All @@ -132,7 +123,7 @@ spotless {

// org.openjfx.javafxplugin
javafx {
version = '16'
version = '17'
// modules = ['javafx.fxml', 'javafx.graphics']
modules = ['javafx.base', 'javafx.controls', 'javafx.media', 'javafx.swing', 'javafx.web', 'javafx.fxml', 'javafx.graphics']
}
Expand Down Expand Up @@ -240,7 +231,7 @@ runtime {
'--win-upgrade-uuid', winUpgradeUUID
]
targetPlatform('win') {
jdkHome = jdkDownload('https://github.com/adoptium/temurin16-binaries/releases/download/jdk-16.0.2%2B7/OpenJDK16U-jdk_x64_windows_hotspot_16.0.2_7.zip');
jdkHome = jdkDownload('https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.1%2B12/OpenJDK17U-jdk_x64_windows_hotspot_17.0.1_12.zip');
}
}

Expand All @@ -251,7 +242,7 @@ runtime {
'--mac-package-name', project.name + developerRelease
]
targetPlatform('mac') {
jdkHome = jdkDownload('https://github.com/adoptium/temurin16-binaries/releases/download/jdk-16.0.2%2B7/OpenJDK16U-jdk_x64_mac_hotspot_16.0.2_7.tar.gz');
jdkHome = jdkDownload('https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.1%2B12/OpenJDK17U-jdk_x64_mac_hotspot_17.0.1_12.tar.gz');
jvmArgs += [ '-Xdock:name=' + project.name + developerRelease ]
}
}
Expand All @@ -277,7 +268,7 @@ runtime {
]
}
targetPlatform('linux') {
jdkHome = jdkDownload('https://github.com/adoptium/temurin16-binaries/releases/download/jdk-16.0.2%2B7/OpenJDK16U-jdk_x64_linux_hotspot_16.0.2_7.tar.gz');
jdkHome = jdkDownload('https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.1%2B12/OpenJDK17U-jdk_x64_linux_hotspot_17.0.1_12.tar.gz');
}
}
}
Expand All @@ -299,18 +290,17 @@ 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.31'
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.7.0' // https://mvnrepository.com/artifact/com.twelvemonkeys.imageio/imageio-core
implementation group: 'com.twelvemonkeys.imageio', name: 'imageio-jpeg', version: '3.7.0' // https://mvnrepository.com/artifact/com.twelvemonkeys.imageio/imageio-core
implementation group: 'com.twelvemonkeys.imageio', name: 'imageio-psd', version: '3.7.0' // https://mvnrepository.com/artifact/com.twelvemonkeys.imageio/imageio-psd
implementation group: 'com.twelvemonkeys.imageio', name: 'imageio-tiff', version: '3.7.0'
implementation group: 'com.twelvemonkeys.imageio', name: 'imageio-batik', version: '3.7.0'
implementation group: 'com.twelvemonkeys.imageio', name: 'imageio-tga', version: '3.7.0'
implementation group: 'com.twelvemonkeys.imageio', name: 'imageio-bmp', version: '3.7.0'
implementation group: 'com.twelvemonkeys.imageio', name: 'imageio-core', version: '3.8.2' // https://mvnrepository.com/artifact/com.twelvemonkeys.imageio/imageio-core
implementation group: 'com.twelvemonkeys.imageio', name: 'imageio-jpeg', version: '3.8.2' // https://mvnrepository.com/artifact/com.twelvemonkeys.imageio/imageio-core
implementation group: 'com.twelvemonkeys.imageio', name: 'imageio-psd', version: '3.8.2' // https://mvnrepository.com/artifact/com.twelvemonkeys.imageio/imageio-psd
implementation group: 'com.twelvemonkeys.imageio', name: 'imageio-tiff', version: '3.8.2'
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

Expand Down Expand Up @@ -364,31 +354,28 @@ dependencies {

implementation 'org.hibernate:antlr:2.7.5H3'
implementation 'org.reflections:reflections:0.9.11'
implementation 'com.caucho:hessian:4.0.63'
implementation 'org.mozilla:rhino:1.7.12'
implementation 'ca.odell.renderpack:renderpack:1.2004'
implementation 'net.tsc.servicediscovery:servicediscovery:1.0.b5'
implementation 'net.sbbi.upnp:upnplib:1.0.9-nodebug'
implementation 'com.withay:withay-util:1.0'
implementation 'xmlpull:xmlpull:1.1.3.1'
implementation 'xpp3:xpp3_min:1.1.4c'
implementation 'com.thoughtworks.xstream:xstream:1.4.17'
implementation 'com.thoughtworks.xstream:xstream:1.4.19'
implementation 'yasb:yasb:0.2-21012007'
implementation 'de.muntjak.tinylookandfeel:tinylaf-nocp:1.4.0'
implementation group: 'org.graalvm.js', name: 'js', version: '21.2.0'
implementation group: 'org.graalvm.js', name: 'js', version: '22.1.0.1'
implementation group: 'org.graalvm.js', name: 'js-scriptengine', version: '21.1.0'

implementation 'com.jayway.jsonpath:json-path:2.6.0'

// For PDF image extraction
implementation 'org.apache.pdfbox:pdfbox:2.0.24'
implementation 'org.apache.pdfbox:pdfbox-tools:2.0.24'
implementation 'org.bouncycastle:bcmail-jdk15on:1.69' // To decrypt passworded/secured pdf's
implementation 'org.apache.pdfbox:pdfbox:2.0.25'
implementation 'org.apache.pdfbox:pdfbox-tools:2.0.25'
implementation 'org.bouncycastle:bcmail-jdk15on:1.70' // To decrypt passworded/secured pdf's
implementation 'com.github.jai-imageio:jai-imageio-core:1.4.0' // For pdf image extraction, specifically for jpeg2000 (jpx) support.
implementation 'com.github.jai-imageio:jai-imageio-jpeg2000:1.4.0' // For pdf image extraction, specifically for jpeg2000 (jpx) support.



implementation 'com.github.gotson:webp-imageio:0.2.1' // webp support https://search.maven.org/artifact/com.github.gotson/webp-imageio/0.2.1/jar

// For syntax highlighting in macro editor
Expand All @@ -407,44 +394,42 @@ dependencies {
implementation group: 'com.squareup.okhttp3', name: 'okhttp', version: '4.9.3'

// Better JSON functions...
implementation group: 'com.google.code.gson', name: 'gson', version: '2.8.9' // https://mvnrepository.com/artifact/com.google.code.gson/gson
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.7.2'
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.7.2'
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.2'

// For mocking features during unit tests
testImplementation group: 'org.mockito', name: 'mockito-core', version: '3.11.2'

// flexmark markdown parsing / conversion
implementation 'com.vladsch.flexmark:flexmark-all:0.62.2'


// Apache Tika Parsers for determining file type
implementation 'com.github.lafa.tikaNoExternal:tika-parsers:1.0.18'

// Noise Generator
implementation 'com.github.cwisniew:NoiseLib:1.0.0' // The most recent version, 1.0.0 is build for a later java version: major version 55 is newer than 54, the highest major version supported by this compiler

// webrtc
implementation group: 'org.java-websocket', name: 'Java-WebSocket', version: '1.5.1'
implementation 'dev.onvoid.webrtc:webrtc-java:0.3.0'
implementation group: 'org.java-websocket', name: 'Java-WebSocket', version: '1.5.2'
implementation 'dev.onvoid.webrtc:webrtc-java:0.5.0'
if (osdetector.os.is('windows'))
implementation 'dev.onvoid.webrtc:webrtc-java:0.3.0:windows-x86_64'
implementation 'dev.onvoid.webrtc:webrtc-java:0.5.0:windows-x86_64'
else if (osdetector.os.is('osx'))
implementation 'dev.onvoid.webrtc:webrtc-java:0.3.0:macos-x86_64'
implementation 'dev.onvoid.webrtc:webrtc-java:0.5.0:macos-x86_64'
else if (osdetector.os.is('linux'))
implementation 'dev.onvoid.webrtc:webrtc-java:0.3.0:linux-x86_64'
implementation 'dev.onvoid.webrtc:webrtc-java:0.5.0:linux-x86_64'

// protobuf
// protobuf
implementation "io.grpc:grpc-protobuf:${grpcVersion}"
implementation "com.google.protobuf:protobuf-java-util:${protobufVersion}"


// Java Tuples
implementation 'com.flipkart.utils:javatuples:3.0'

Expand Down