Dave Jarvis' Repositories
git clone https://repo.autonoma.ca/repo/keenwrite.git
Revise quotation mark usage
| Author | DaveJarvis <email> |
|---|---|
| Date | 2022-08-06 13:05:10 GMT-0700 |
| Commit | 546591f1a04e02e8ccfb163df475fe743b57d849 |
| Parent | 2211f0d |
| Delta | 34 lines added, 45 lines removed, 11-line decrease |
build.gradle
| mavenCentral() | ||
| - maven { | ||
| - url 'https://oss.sonatype.org/content/repositories/snapshots/' | ||
| - } | ||
| - | ||
| - maven { | ||
| - url "https://nexus.bedatadriven.com/content/groups/public" | ||
| - } | ||
| + maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' } | ||
| + maven { url 'https://nexus.bedatadriven.com/content/groups/public' } | ||
| } | ||
| // Assume a cross-platform überjar unless targetOs is set. | ||
| -String[] os = ["win", "mac", "linux"] | ||
| +String[] os = ['win', 'mac', 'linux'] | ||
| -if (project.hasProperty('targetOs')) { | ||
| - if ("windows" == targetOs) { | ||
| +if (project.hasProperty( 'targetOs' )) { | ||
| + if ('windows' == targetOs) { | ||
| os = ["win"] | ||
| } else { | ||
| os = [targetOs] | ||
| } | ||
| } | ||
| def moduleSecurity = [ | ||
| - "--add-opens=javafx.controls/javafx.scene.control=ALL-UNNAMED", | ||
| - "--add-opens=javafx.controls/javafx.scene.control.skin=ALL-UNNAMED", | ||
| - "--add-opens=javafx.graphics/javafx.scene.text=ALL-UNNAMED", | ||
| - "--add-opens=javafx.graphics/com.sun.javafx.css=ALL-UNNAMED", | ||
| - "--add-opens=javafx.graphics/com.sun.javafx.text=ALL-UNNAMED", | ||
| - "--add-exports=javafx.base/com.sun.javafx.event=ALL-UNNAMED", | ||
| - "--add-exports=javafx.graphics/com.sun.javafx.application=ALL-UNNAMED", | ||
| - "--add-exports=javafx.graphics/com.sun.javafx.geom=ALL-UNNAMED", | ||
| - "--add-exports=javafx.graphics/com.sun.javafx.text=ALL-UNNAMED", | ||
| - "--add-exports=javafx.graphics/com.sun.javafx.scene=ALL-UNNAMED", | ||
| - "--add-exports=javafx.graphics/com.sun.javafx.scene.text=ALL-UNNAMED", | ||
| - "--add-exports=javafx.graphics/com.sun.javafx.scene.traversal=ALL-UNNAMED", | ||
| + '--add-opens=javafx.controls/javafx.scene.control=ALL-UNNAMED', | ||
| + '--add-opens=javafx.controls/javafx.scene.control.skin=ALL-UNNAMED', | ||
| + '--add-opens=javafx.graphics/javafx.scene.text=ALL-UNNAMED', | ||
| + '--add-opens=javafx.graphics/com.sun.javafx.css=ALL-UNNAMED', | ||
| + '--add-opens=javafx.graphics/com.sun.javafx.text=ALL-UNNAMED', | ||
| + '--add-exports=javafx.base/com.sun.javafx.event=ALL-UNNAMED', | ||
| + '--add-exports=javafx.graphics/com.sun.javafx.application=ALL-UNNAMED', | ||
| + '--add-exports=javafx.graphics/com.sun.javafx.geom=ALL-UNNAMED', | ||
| + '--add-exports=javafx.graphics/com.sun.javafx.text=ALL-UNNAMED', | ||
| + '--add-exports=javafx.graphics/com.sun.javafx.scene=ALL-UNNAMED', | ||
| + '--add-exports=javafx.graphics/com.sun.javafx.scene.text=ALL-UNNAMED', | ||
| + '--add-exports=javafx.graphics/com.sun.javafx.scene.traversal=ALL-UNNAMED', | ||
| ] | ||
| javafx { | ||
| - version = "18" | ||
| + version = '18' | ||
| modules = ['javafx.controls', 'javafx.swing'] | ||
| configuration = 'compileOnly' | ||
 | ||
| // HTML parsing and rendering | ||
| implementation 'org.jsoup:jsoup:1.15.2' | ||
| - // TODO: Wait for https://github.com/flyingsaucerproject/flyingsaucer/pull/170 | ||
| + // TODO: https://github.com/flyingsaucerproject/flyingsaucer/pull/170 | ||
| //implementation 'org.xhtmlrenderer:flying-saucer-core:9.1.22' | ||
| ||
| // Spelling, TeX, Docking, KeenQuotes | ||
| - implementation fileTree(include: ['**/*.jar'], dir: 'libs') | ||
| + implementation fileTree( include: ['**/*.jar'], dir: 'libs' ) | ||
| def fx = ['controls', 'graphics', 'fxml', 'swing'] | ||
| fx.each { fxitem -> | ||
| os.each { ositem -> | ||
| runtimeOnly "org.openjfx:javafx-${fxitem}:${javafx.version}:${ositem}" | ||
| } | ||
| } | ||
| - testImplementation "org.testfx:testfx-junit5:4.0.16-alpha" | ||
| + testImplementation 'org.testfx:testfx-junit5:4.0.16-alpha' | ||
| testImplementation "org.junit.jupiter:junit-jupiter-api:${v_junit}" | ||
| testImplementation "org.junit.jupiter:junit-jupiter-params:${v_junit}" | ||
| testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine' | ||
| } | ||
| compileJava { | ||
| - options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation" | ||
| + options.compilerArgs << '-Xlint:unchecked' << '-Xlint:deprecation' | ||
| } | ||
| def resourceDir = sourceSets.main.resources.srcDirs[0] | ||
| final Properties config = new Properties() | ||
| -final File configFile = file("${resourceDir}/bootstrap.properties") | ||
| -final FileInputStream configStream = new FileInputStream(configFile) | ||
| -config.load(configStream) | ||
| +final File configFile = file( "${resourceDir}/bootstrap.properties" ) | ||
| +final FileInputStream configStream = new FileInputStream( configFile ) | ||
| +config.load( configStream ) | ||
| configStream.close() | ||
| -final String applicationName = config.get("application.title").toString().toLowerCase() | ||
| +final String applicationName = config.get( 'application.title' ).toString().toLowerCase() | ||
| final String applicationClass = "com.${applicationName}.Launcher" | ||
| application { | ||
| - mainClass.set(applicationClass) | ||
| + mainClass.set( applicationClass ) | ||
| applicationDefaultJvmArgs = moduleSecurity | ||
| } | ||
| version = gitVersion() | ||
| -final File propertiesFile = new File("${resourceDir}/com/${applicationName}/app.properties") | ||
| -propertiesFile.write("application.version=${version}") | ||
| +final File p = new File( "${resourceDir}/com/${applicationName}/app.properties" ) | ||
| +p.write( "application.version=${version}" ) | ||
| jar { | ||
| ||
| from { | ||
| - (configurations.runtimeClasspath.findAll { !it.path.endsWith(".pom") }).collect { | ||
| - it.isDirectory() ? it : zipTree(it) | ||
| - } | ||
| + (configurations.runtimeClasspath.findAll { !it.path.endsWith( ".pom" ) }) | ||
| + .collect { it.isDirectory() ? it : zipTree( it ) } | ||
| } | ||
| ||
| contents { | ||
| from { ['LICENSE.md', 'README.md'] } | ||
| - into('images') { | ||
| + into( 'images' ) { | ||
| from { 'images' } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| test { | ||
| useJUnitPlatform() | ||
| - | ||
| - doFirst { | ||
| - jvmArgs = moduleSecurity | ||
| - } | ||
| - testLogging { | ||
| - exceptionFormat = 'full' | ||
| - } | ||
| + doFirst { jvmArgs = moduleSecurity } | ||
| + testLogging { exceptionFormat = 'full' } | ||
| } | ||