Skip to content

Commit

Permalink
Fix software not starting on current java and macOS versions, update …
Browse files Browse the repository at this point in the history
…dependencies and gradle build
  • Loading branch information
moritzfl committed Jan 21, 2022
1 parent f311e2f commit 78d8a9c
Show file tree
Hide file tree
Showing 9 changed files with 241 additions and 177 deletions.
8 changes: 0 additions & 8 deletions .idea/compiler.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

55 changes: 55 additions & 0 deletions .idea/jarRepositories.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

48 changes: 17 additions & 31 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,10 @@

plugins {
id 'java'
id 'edu.sc.seis.launch4j' version '2.4.6'
id 'com.github.johnrengelman.shadow' version '5.1.0'
id 'edu.sc.seis.launch4j' version '2.5.1'
id 'com.github.johnrengelman.shadow' version '7.1.2'
id 'application'
id "edu.sc.seis.macAppBundle" version "2.3.0"
id "com.github.ben-manes.versions" version "0.21.0"
id "com.github.ben-manes.versions" version "0.41.0"
}


Expand All @@ -19,31 +18,30 @@ repositories {
}

maven {
url = 'http://central.maven.org/maven2/'
url = 'https://central.maven.org/maven2/'
}

maven {
url = 'https://jitpack.io'
}

maven {
url = 'http://repo.maven.apache.org/maven2'
url = 'https://repo.maven.apache.org/maven2'
}
}

dependencies {
compile 'org.slf4j:slf4j-simple:2.0.0-alpha0'
compile 'javax.activation:activation:1.1.1'
compile 'com.google.code.gson:gson:2.8.5'
compile 'org.apache.pdfbox:pdfbox:2.0.16'
compile 'com.github.Arnauld:gutenberg:18d761ddba'
compile 'org.scilab.forge:jlatexmath:1.0.7'
compile 'com.itextpdf:itextpdf:5.5.13.1'
compile 'com.itextpdf.tool:xmlworker:5.5.13.1'
compile files("${projectDir}/lib/jai_core-1.1.3.jar")
compile files("${projectDir}/lib/mathocr-0.0.3.jar")
compile 'io.github.soc:directories:11'
compile 'com.bulenkov:darcula:2018.2'
implementation 'org.slf4j:slf4j-simple:2.0.0-alpha6'
implementation 'javax.activation:activation:1.1.1'
implementation 'com.google.code.gson:gson:2.8.9'
implementation 'org.apache.pdfbox:pdfbox:2.0.25'
implementation 'com.github.Arnauld:gutenberg:18d761ddba'
implementation 'org.scilab.forge:jlatexmath:1.0.7'
implementation 'com.itextpdf:itextpdf:5.5.13.2'
implementation 'com.itextpdf.tool:xmlworker:5.5.13.2'
implementation files("${projectDir}/lib/jai_core-1.1.3.jar")
implementation files("${projectDir}/lib/mathocr-0.0.3.jar")
implementation 'io.github.soc:directories:11'
}
application {
mainClassName = "${project.mainClassName}"
Expand All @@ -54,7 +52,7 @@ run {
}

group = 'com.github.moritzfl'
version = '2.2.2.1'
version = '2.2.2.2'
description = 'mathematicallatexhelper'
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
Expand All @@ -71,15 +69,3 @@ manifest {
}

tasks.createExe.dependsOn('shadowJar')

macAppBundle {
version = "${version}"
mainClassName = "${project.mainClassName}"
bundleExecutable = "${project.description}"
bundleIdentifier = "${project.group}.${project.description}"
icon = "${projectDir}/src/main/resources/icon.icns"
bundleJRE = false
runtimeConfigurationName = 'shadow'
jarTask = 'shadowJar'
bundleExtras.put("NSRequiresAquaSystemAppearance", "NO")
}
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-5.5.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading

0 comments on commit 78d8a9c

Please sign in to comment.