Commit e35298bd authored by Fred Eisele's avatar Fred Eisele
Browse files

updated gradle version

parent c20364f9

gradle/wrapper/gradle-wrapper.jar

−426 B (54.4 KiB)

File changed.

No diff preview for this file type.

View original file
View changed file

gradlew

+1 −1
Changes for gradlew: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -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"

gradlew.bat

+1 −1
Changes for gradlew.bat: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -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

src/main/java/catdata/aql/exp/AqlLoaderListener.java

+0 −4
Changes for src/main/java/catdata/aql/exp/AqlLoaderListener.java: 0 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -917,11 +917,7 @@ public class AqlLoaderListener extends AqlParserBaseListener { 
		final MapExp<Ty,En,Sym, Fk, Att, En, Fk, Att> 

		comp = ctx.mappingRef().stream()

				.map(ref -> (MapExp.MapExpVar) this.exps.get(ref))

<<<<<<< HEAD

				.collect(() -> new MapComposer<Ty,En,Sym, Fk, Att>(),

=======

				.collect(() -> new MapComposer(),

>>>>>>> a4355c78c2c07cf0fba056f10301726fac6a1107

						(acc, nxt) -> acc.compose(nxt),

						(lhs, rhs) -> lhs.combine(rhs))

				.result();