Skip to content

Commit

Permalink
Uses new vcsg release with fixed fromSTEP() and BREP
Browse files Browse the repository at this point in the history
  • Loading branch information
miho committed Dec 7, 2018
1 parent 100cbac commit c28a649
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 10 deletions.
12 changes: 6 additions & 6 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -14,24 +14,24 @@ plugins {
// id 'com.github.hierynomus.license' version '0.13.1'
id 'maven-publish'
id 'net.nemerosa.versioning' version '2.6.1'
id 'com.jfrog.bintray' version '1.8.1'
id 'com.jfrog.bintray' version '1.8.4'
id 'com.github.ben-manes.versions' version '0.13.0'
}

ext.VRL_VERSION = '0.4.3.2.3'

apply plugin: 'java'

sourceCompatibility = '1.8'
targetCompatibility = '1.8'
[compileJava, compileTestJava]*.options*.encoding = 'UTF-8'

tasks.withType(Javadoc) {
options.addStringOption('Xdoclint:none', '-quiet')
}

task wrapper(type: Wrapper) {
gradleVersion = '4.10'
distributionUrl = "https://services.gradle.org/distributions/gradle-$gradleVersion-all.zip"
wrapper {
gradleVersion = '5.0'
}

repositories {
Expand All @@ -44,7 +44,7 @@ repositories {
}

dependencies {
testCompile group: 'junit', name: 'junit', version: '4.10'
testCompile group: 'junit', name: 'junit', version: '4.12'

compile (group: 'eu.mihosoft.vrl', name: 'vrl', version: VRL_VERSION)
compile (group: 'eu.mihosoft.vrl', name: 'vrl', version: VRL_VERSION, classifier: 'sources')
Expand All @@ -64,7 +64,7 @@ dependencies {

compile group: 'eu.mihosoft.vrl.vrljogl', name: 'vrl-jogl', version: '0.4.2'

compile group: 'eu.mihosoft.vcsg', name: 'vcsg', version: '0.7.1'
compile group: 'eu.mihosoft.vcsg', name: 'vcsg', version: '0.7.2'
compile group: 'eu.mihosoft.vcsg.vcsgdist', name: 'vcsg-dist', version: '0.9.1.0'

// compile files("lib/jars/")
Expand Down
2 changes: 1 addition & 1 deletion gradle/project-info.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// -----------------------------------------------------------------------------
ext.publishing.artifactId = project.name.toLowerCase()
ext.publishing.groupId = 'eu.mihosoft.vrl.vcsg.vplugin'
ext.publishing.versionId = '0.6.1'
ext.publishing.versionId = '0.6.2'

ext.publishing.developerName = 'Michael Hoffer'
ext.publishing.developerAlias = 'miho'
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 2 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#Fri Dec 07 16:27:18 CET 2018
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.0-all.zip
2 changes: 1 addition & 1 deletion gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ APP_NAME="Gradle"
APP_BASE_NAME=`basename "$0"`

# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS=""
DEFAULT_JVM_OPTS='"-Xmx64m"'

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"
Expand Down
2 changes: 1 addition & 1 deletion gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%

@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS=
set DEFAULT_JVM_OPTS="-Xmx64m"

@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome
Expand Down

0 comments on commit c28a649

Please sign in to comment.