Skip to content

Commit

Permalink
Merge pull request #100 from fujaba/fix/update-dependencies
Browse files Browse the repository at this point in the history
Update dependencies
  • Loading branch information
Clashsoft authored Aug 9, 2021
2 parents 625df9d + 6829912 commit 6887a42
Show file tree
Hide file tree
Showing 8 changed files with 15 additions and 16 deletions.
17 changes: 8 additions & 9 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -83,15 +83,14 @@ modifyPom {
repositories {
mavenLocal()
mavenCentral()
jcenter()
}

dependencies {
// https://mvnrepository.com/artifact/org.fulib/fulibScenarios
fulibScenarios group: 'org.fulib', name: 'fulibScenarios', version: '1.6.2'
fulibScenarios group: 'org.fulib', name: 'fulibScenarios', version: '1.7.0'

// https://mvnrepository.com/artifact/org.antlr/antlr4
antlr group: 'org.antlr', name: 'antlr4', version: '4.9.1'
antlr group: 'org.antlr', name: 'antlr4', version: '4.9.2'

// https://mvnrepository.com/artifact/org.fulib/fulibYaml
api group: 'org.fulib', name: 'fulibYaml', version: '1.5.0'
Expand All @@ -100,24 +99,24 @@ dependencies {
implementation group: 'org.antlr', name: 'ST4', version: '4.3.1'

// https://mvnrepository.com/artifact/org.antlr/antlr4-runtime
implementation group: 'org.antlr', name: 'antlr4-runtime', version: '4.9.1'
implementation group: 'org.antlr', name: 'antlr4-runtime', version: '4.9.2'

// https://mvnrepository.com/artifact/org.hamcrest/hamcrest-library
testImplementation group: 'org.hamcrest', name: 'hamcrest-library', version: '2.2'

// https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-api
testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.7.1'
testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.7.2'

// https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-params
testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-params', version: '5.7.1'
testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-params', version: '5.7.2'

// https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-engine
testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.7.1'
testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.7.2'

genCompile sourceSets.main.output + sourceSets.main.runtimeClasspath
genImplementation sourceSets.main.output + sourceSets.main.runtimeClasspath

// https://mvnrepository.com/artifact/org.fulib/fulibTools
genCompile group: 'org.fulib', name: 'fulibTools', version: '1.4.1'
genImplementation group: 'org.fulib', name: 'fulibTools', version: '1.5.1'
}

if (JavaVersion.current().java11Compatible) {
Expand Down
1 change: 1 addition & 0 deletions src/main/java/org/fulib/classmodel/Attribute.java
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,7 @@ private static String buildTypeSignature(String type)
*
* @since 1.5
*/
@Deprecated
public boolean isBoolean()
{
return Type.BOOLEAN.equals(this.type);
Expand Down
13 changes: 6 additions & 7 deletions test/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,29 +9,28 @@ version = '0.1.0'
repositories {
mavenLocal()
mavenCentral()
jcenter()
}

dependencies {
// https://mvnrepository.com/artifact/org.fulib/fulibScenarios
fulibScenarios group: 'org.fulib', name: 'fulibScenarios', version: '1.4.2', {
fulibScenarios group: 'org.fulib', name: 'fulibScenarios', version: '1.7.0', {
exclude group: 'org.fulib', module: 'fulib'
}

// override fulib dependency
fulibScenarios rootProject

// https://mvnrepository.com/artifact/it.unimi.dsi/fastutil
def fastUtil = [ group: 'it.unimi.dsi', name: 'fastutil', version: '8.4.2' ]
def fastUtil = [ group: 'it.unimi.dsi', name: 'fastutil', version: '8.5.4' ]

compile fastUtil
genCompile fastUtil
implementation fastUtil
genImplementation fastUtil

// https://mvnrepository.com/artifact/junit/junit
testCompile group: 'junit', name: 'junit', version: '4.13'
testImplementation group: 'junit', name: 'junit', version: '4.13.2'

// https://mvnrepository.com/artifact/org.fulib/fulibTools
testCompile group: 'org.fulib', name: 'fulibTools', version: '1.2.1'
testImplementation group: 'org.fulib', name: 'fulibTools', version: '1.5.1'
}

generateScenarioSource {
Expand Down
Binary file modified test/doc/images/studyRightObjects.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test/src/main/java/de/uniks/studyright/classDiagram.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test/src/main/java/org/fulib/docs/classDiagram.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test/src/main/java/org/fulib/docs/dtos/dto/classDiagram.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test/src/main/java/org/fulib/docs/dtos/model/classDiagram.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 6887a42

Please sign in to comment.