Skip to content

Commit

Permalink
Merge 73a5cda into 6a51f8d
Browse files Browse the repository at this point in the history
  • Loading branch information
danilovesky committed Jul 3, 2023
2 parents 6a51f8d + 73a5cda commit 1f865bf
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 8 deletions.
1 change: 1 addition & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ subprojects {
lib fileTree(dir: gradle.libDir, include: ['**/*.jar'])
configurations.api.extendsFrom(configurations.lib)
testImplementation gradle.junit
testRuntimeOnly gradle.junit
javacc gradle.javacc
}

Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
10 changes: 5 additions & 5 deletions settings.gradle
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
pluginManagement {
plugins {
id 'org.jetbrains.kotlin.jvm' version '1.8.20'
id 'org.jetbrains.kotlin.jvm' version '1.8.22'
id 'ca.coglinc.javacc' version '2.4.0'
id 'com.github.kt3k.coveralls' version '2.12.2'
id 'de.aaschmid.cpd' version '3.3'
id 'com.github.jk1.dependency-license-report' version '2.1'
id 'com.github.jk1.dependency-license-report' version '2.5'
}
}

Expand All @@ -19,17 +19,17 @@ gradle.ext.javaTargetVersion = JavaVersion.VERSION_11
gradle.ext.javaReleaseVersion = 11 /* Must be integer, e.g. 11 for JDK11*/

// Code quality and coverage tools (Checkstyle, PMD, Jacoco)
gradle.ext.checkstyleVersion = '10.9.3'
gradle.ext.checkstyleVersion = '10.12.1'
gradle.ext.pmdVersion = '6.55.0'
gradle.ext.jacocoVersion = '0.8.8'
gradle.ext.jacocoVersion = '0.8.10'


/*
* Compile-time dependencies for all subprojects
*/

// Unit testing
gradle.ext.junit = 'org.junit.jupiter:junit-jupiter-engine:5.9.2'
gradle.ext.junit = 'org.junit.jupiter:junit-jupiter-engine:5.9.3'

// JavaCC parser generator
gradle.ext.javacc = 'net.java.dev.javacc:javacc:7.0.12'
Expand Down
4 changes: 2 additions & 2 deletions workcraft/WorkcraftCore/build.gradle
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
dependencies {
lib 'org.jetbrains.kotlin:kotlin-stdlib:1.8.20' // for Kotlin support
lib 'org.jetbrains.kotlin:kotlin-stdlib:1.8.22' // for Kotlin support
lib 'org.mozilla:rhino:1.7.14' // for JavaScript execution
lib 'com.sun.activation:javax.activation:1.2.0' // for JavaBeans Activation Framework (JAF)
lib 'log4j:log4j:1.2.17' // for configuration of log in FOP
lib 'info.clearthought:table-layout:4.3.0' // for TableLayout
lib 'commons-io:commons-io:2.11.0' // for logging in Batik PDF Transcoder
lib 'commons-io:commons-io:2.13.0' // for logging in Batik PDF Transcoder
lib 'commons-logging:commons-logging:1.2' // for logging in Batik PDF Transcoder
}

Expand Down

0 comments on commit 1f865bf

Please sign in to comment.