Merge "Revert "Allow collection type converters in query parameters"" into oc-mr1-support-27.0-dev
diff --git a/app-toolkit/gradle/wrapper/gradle-wrapper.properties b/app-toolkit/gradle/wrapper/gradle-wrapper.properties
index 9d09896..79f002a 100644
--- a/app-toolkit/gradle/wrapper/gradle-wrapper.properties
+++ b/app-toolkit/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=../../../../../tools/external/gradle/gradle-4.3-bin.zip
+distributionUrl=../../../../../tools/external/gradle/gradle-4.4-bin.zip
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 96e6dab..e355705 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=../../../../tools/external/gradle/gradle-4.3-bin.zip
+distributionUrl=../../../../tools/external/gradle/gradle-4.4-bin.zip
diff --git a/room/compiler/build.gradle b/room/compiler/build.gradle
index 57ff63f..739491a 100644
--- a/room/compiler/build.gradle
+++ b/room/compiler/build.gradle
@@ -65,7 +65,7 @@
def generateAntlrTask = task('generateAntlrGrammar', type: JavaExec) {
def outFolder = file(antlrOut)
outputs.dir(outFolder)
- inputs.dir("$projectDir/SQLite.g4")
+ inputs.file("$projectDir/SQLite.g4")
classpath configurations.runtime
main "org.antlr.v4.Tool"
args "SQLite.g4", "-visitor", "-o", new File(outFolder, "android/arch/persistence/room/parser").path,