Merge pull request #84 from Cognifide/vlt-filter-absolute

pun-ky · web-flow · commit fe3781c1852d · 2017-11-28T08:08:17.000+01:00
VLT filter absolute + Gradle &amp; Kotlin upgrade
diff --git a/README.md b/README.md
@@ -63,7 +63,7 @@ buildscript {
     }
     
     dependencies {
-        classpath 'com.cognifide.gradle:aem-plugin:2.0.11'
+        classpath 'com.cognifide.gradle:aem-plugin:2.0.12'
     }
 }
 
diff --git a/build.gradle b/build.gradle
@@ -1,12 +1,12 @@
 plugins {
     id 'java-gradle-plugin'
     id 'maven-publish'
-    id "org.jetbrains.kotlin.jvm" version "1.1.4"
+    id "org.jetbrains.kotlin.jvm" version "1.1.60"
     id "com.jfrog.bintray" version "1.7.3"
 }
 
 group 'com.cognifide.gradle'
-version '2.0.11'
+version '2.0.12'
 description = 'Gradle AEM Plugin'
 defaultTasks = ['clean', 'publishToMavenLocal']
 
@@ -19,7 +19,7 @@ dependencies {
     compile gradleApi()
     compile localGroovy()
 
-    compile "org.jetbrains.kotlin:kotlin-stdlib:1.1.4"
+    compile "org.jetbrains.kotlin:kotlin-stdlib:1.1.60"
     compile 'org.apache.commons:commons-lang3:3.4'
     compile 'commons-io:commons-io:2.4'
     compile 'commons-httpclient:commons-httpclient:3.1'
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
+#Mon Nov 27 15:00:18 CET 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.3.1-bin.zip
diff --git a/src/main/kotlin/com/cognifide/gradle/aem/internal/file/FileOperations.kt b/src/main/kotlin/com/cognifide/gradle/aem/internal/file/FileOperations.kt
@@ -76,7 +76,8 @@ object FileOperations {
     fun find(project: Project, dirIfFileName: String, pathOrFileName: String): File? {
         return mutableListOf<(String) -> File>(
                 { project.file(pathOrFileName) },
-                { File(File(dirIfFileName), pathOrFileName) }
+                { File(File(dirIfFileName), pathOrFileName) },
+                { File(pathOrFileName) }
         ).map { it(pathOrFileName) }.firstOrNull { it.exists() }
     }
 
diff --git a/src/main/kotlin/com/cognifide/gradle/aem/internal/file/FileResolver.kt b/src/main/kotlin/com/cognifide/gradle/aem/internal/file/FileResolver.kt
@@ -47,7 +47,7 @@ class FileResolver(val project: Project, val downloadDir: File) {
     fun attach(task: DefaultTask, prop: String = "fileResolver") {
         task.outputs.dir(downloadDir)
         project.afterEvaluate {
-            task.inputs.property(prop, configurationHash)
+            task.inputs.properties(mapOf(prop to configurationHash))
         }
     }
 
diff --git a/src/main/kotlin/com/cognifide/gradle/aem/pkg/ComposeTask.kt b/src/main/kotlin/com/cognifide/gradle/aem/pkg/ComposeTask.kt
@@ -1,6 +1,7 @@
 package com.cognifide.gradle.aem.pkg
 
 import com.cognifide.gradle.aem.AemConfig
+import com.cognifide.gradle.aem.AemException
 import com.cognifide.gradle.aem.AemPackagePlugin
 import com.cognifide.gradle.aem.AemTask
 import com.cognifide.gradle.aem.internal.Patterns
@@ -93,7 +94,7 @@ open class ComposeTask : Zip(), AemTask {
     }
 
     fun includeProject(projectPath: String) {
-        includeProject(project.findProject(projectPath))
+        includeProject(findProject(projectPath))
     }
 
     fun includeProject(project: Project) {
@@ -120,29 +121,27 @@ open class ComposeTask : Zip(), AemTask {
     }
 
     fun includeBundles(projectPath: String) {
-        val project = project.findProject(projectPath)
-
-        includeBundlesAtPath(project)
+        includeBundlesAtPath(findProject(projectPath))
     }
 
     fun includeBundles(project: Project) {
         includeBundlesAtPath(project)
     }
 
     fun includeBundles(projectPath: String, runMode: String) {
-        includeBundlesAtPath(project.findProject(projectPath), runMode = runMode)
+        includeBundlesAtPath(findProject(projectPath), runMode = runMode)
     }
 
     fun mergeBundles(projectPath: String) {
-        includeBundlesAtPath(project.findProject(projectPath))
+        includeBundlesAtPath(findProject(projectPath))
     }
 
     fun mergeBundles(projectPath: String, runMode: String) {
-        includeBundlesAtPath(project.findProject(projectPath), runMode = runMode)
+        includeBundlesAtPath(findProject(projectPath), runMode = runMode)
     }
 
     fun includeBundlesAtPath(projectPath: String, installPath: String) {
-        includeBundlesAtPath(project.findProject(projectPath), installPath)
+        includeBundlesAtPath(findProject(projectPath), installPath)
     }
 
     fun includeBundlesAtPath(project: Project, installPath: String? = null, runMode: String? = null) {
@@ -173,7 +172,7 @@ open class ComposeTask : Zip(), AemTask {
     }
 
     fun includeContent(projectPath: String) {
-        includeContent(project.findProject(projectPath))
+        includeContent(findProject(projectPath))
     }
 
     fun includeContent(project: Project) {
@@ -193,8 +192,13 @@ open class ComposeTask : Zip(), AemTask {
         }
     }
 
+    private fun findProject(projectPath: String) : Project {
+        return project.findProject(projectPath)
+                ?: throw AemException("Project cannot be found by path '$projectPath'")
+    }
+
     private fun dependProject(projectPath: String, taskNames: Collection<String>) {
-        dependProject(project.findProject(projectPath), taskNames)
+        dependProject(findProject(projectPath), taskNames)
     }
 
     private fun dependProject(project: Project, taskNames: Collection<String>) {
diff --git a/src/test/kotlin/com/cognifide/gradle/aem/test/ComposeTaskTest.kt b/src/test/kotlin/com/cognifide/gradle/aem/test/ComposeTaskTest.kt
@@ -32,7 +32,7 @@ class ComposeTaskTest : BuildTest() {
 
             assertPackageFile(assemblyPkg, "jcr_root/apps/example/common/.content.xml")
             assertPackageFile(assemblyPkg, "jcr_root/apps/example/common/install/common-1.0.0-SNAPSHOT.jar")
-            assertPackageFile(assemblyPkg, "jcr_root/apps/example/common/install/kotlin-osgi-bundle-1.1.4.jar")
+            assertPackageFile(assemblyPkg, "jcr_root/apps/example/common/install/kotlin-osgi-bundle-1.1.60.jar")
 
             assertPackageFile(assemblyPkg, "jcr_root/etc/designs/example/.content.xml")
 
@@ -43,7 +43,7 @@ class ComposeTaskTest : BuildTest() {
             val commonPkg = assertPackage(projectDir, "common/build/distributions/example-common-1.0.0-SNAPSHOT.zip")
             assertPackageFile(commonPkg, "jcr_root/apps/example/common/.content.xml")
             assertPackageFile(commonPkg, "jcr_root/apps/example/common/install/common-1.0.0-SNAPSHOT.jar")
-            assertPackageFile(commonPkg, "jcr_root/apps/example/common/install/kotlin-osgi-bundle-1.1.4.jar")
+            assertPackageFile(commonPkg, "jcr_root/apps/example/common/install/kotlin-osgi-bundle-1.1.60.jar")
 
             val designPkg = assertPackage(projectDir, "design/build/distributions/example-design-1.0.0-SNAPSHOT.zip")
             assertPackageFile(designPkg, "jcr_root/etc/designs/example/.content.xml")
diff --git a/src/test/resources/com/cognifide/gradle/aem/test/compose/assembly/common/build.gradle b/src/test/resources/com/cognifide/gradle/aem/test/compose/assembly/common/build.gradle
@@ -19,6 +19,6 @@ bundle {
 }
 
 dependencies {
-    aemInstall group: 'org.jetbrains.kotlin', name: 'kotlin-osgi-bundle', version: '1.1.4'
+    aemInstall group: 'org.jetbrains.kotlin', name: 'kotlin-osgi-bundle', version: '1.1.60'
     aemEmbed group: 'org.hashids', name: 'hashids', version: '1.0.1'
 }
diff --git a/src/test/resources/com/cognifide/gradle/aem/test/compose/assembly/gradle/buildscript.gradle b/src/test/resources/com/cognifide/gradle/aem/test/compose/assembly/gradle/buildscript.gradle
@@ -7,7 +7,7 @@ repositories {
 }
 
 dependencies {
-    classpath 'com.cognifide.gradle:aem-plugin:2.0.11'
+    classpath 'com.cognifide.gradle:aem-plugin:2.0.12'
     classpath "org.dm.gradle:gradle-bundle-plugin:0.10.0"
-    classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.1.4"
+    classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.1.60"
 }
diff --git a/src/test/resources/com/cognifide/gradle/aem/test/compose/bundle-and-content/build.gradle b/src/test/resources/com/cognifide/gradle/aem/test/compose/bundle-and-content/build.gradle
@@ -7,7 +7,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.cognifide.gradle:aem-plugin:2.0.11'
+        classpath 'com.cognifide.gradle:aem-plugin:2.0.12'
         classpath 'org.dm.gradle:gradle-bundle-plugin:0.10.0'
     }
 }
diff --git a/src/test/resources/com/cognifide/gradle/aem/test/debug/build.gradle b/src/test/resources/com/cognifide/gradle/aem/test/debug/build.gradle
@@ -7,7 +7,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.cognifide.gradle:aem-plugin:2.0.11'
+        classpath 'com.cognifide.gradle:aem-plugin:2.0.12'
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ buildscript {`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`dependencies {`
`66`		`- classpath 'com.cognifide.gradle:aem-plugin:2.0.11'`
	`66`	`+ classpath 'com.cognifide.gradle:aem-plugin:2.0.12'`
`67`	`67`	`}`
`68`	`68`	`}`
`69`	`69`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,8 @@ object FileOperations {`
`76`	`76`	`fun find(project: Project, dirIfFileName: String, pathOrFileName: String): File? {`
`77`	`77`	`return mutableListOf<(String) -> File>(`
`78`	`78`	`{ project.file(pathOrFileName) },`
`79`		`- { File(File(dirIfFileName), pathOrFileName) }`
	`79`	`+ { File(File(dirIfFileName), pathOrFileName) },`
	`80`	`+ { File(pathOrFileName) }`
`80`	`81`	`).map { it(pathOrFileName) }.firstOrNull { it.exists() }`
`81`	`82`	`}`
`82`	`83`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ class FileResolver(val project: Project, val downloadDir: File) {`
`47`	`47`	`fun attach(task: DefaultTask, prop: String = "fileResolver") {`
`48`	`48`	`task.outputs.dir(downloadDir)`
`49`	`49`	`project.afterEvaluate {`
`50`		`- task.inputs.property(prop, configurationHash)`
	`50`	`+ task.inputs.properties(mapOf(prop to configurationHash))`
`51`	`51`	`}`
`52`	`52`	`}`
`53`	`53`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`package com.cognifide.gradle.aem.pkg`
`2`	`2`
`3`	`3`	`import com.cognifide.gradle.aem.AemConfig`
	`4`	`+import com.cognifide.gradle.aem.AemException`
`4`	`5`	`import com.cognifide.gradle.aem.AemPackagePlugin`
`5`	`6`	`import com.cognifide.gradle.aem.AemTask`
`6`	`7`	`import com.cognifide.gradle.aem.internal.Patterns`
`@@ -93,7 +94,7 @@ open class ComposeTask : Zip(), AemTask {`
`93`	`94`	`}`
`94`	`95`
`95`	`96`	`fun includeProject(projectPath: String) {`
`96`		`- includeProject(project.findProject(projectPath))`
	`97`	`+ includeProject(findProject(projectPath))`
`97`	`98`	`}`
`98`	`99`
`99`	`100`	`fun includeProject(project: Project) {`
`@@ -120,29 +121,27 @@ open class ComposeTask : Zip(), AemTask {`
`120`	`121`	`}`
`121`	`122`
`122`	`123`	`fun includeBundles(projectPath: String) {`
`123`		`- val project = project.findProject(projectPath)`
`124`		`-`
`125`		`- includeBundlesAtPath(project)`
	`124`	`+ includeBundlesAtPath(findProject(projectPath))`
`126`	`125`	`}`
`127`	`126`
`128`	`127`	`fun includeBundles(project: Project) {`
`129`	`128`	`includeBundlesAtPath(project)`
`130`	`129`	`}`
`131`	`130`
`132`	`131`	`fun includeBundles(projectPath: String, runMode: String) {`
`133`		`- includeBundlesAtPath(project.findProject(projectPath), runMode = runMode)`
	`132`	`+ includeBundlesAtPath(findProject(projectPath), runMode = runMode)`
`134`	`133`	`}`
`135`	`134`
`136`	`135`	`fun mergeBundles(projectPath: String) {`
`137`		`- includeBundlesAtPath(project.findProject(projectPath))`
	`136`	`+ includeBundlesAtPath(findProject(projectPath))`
`138`	`137`	`}`
`139`	`138`
`140`	`139`	`fun mergeBundles(projectPath: String, runMode: String) {`
`141`		`- includeBundlesAtPath(project.findProject(projectPath), runMode = runMode)`
	`140`	`+ includeBundlesAtPath(findProject(projectPath), runMode = runMode)`
`142`	`141`	`}`
`143`	`142`
`144`	`143`	`fun includeBundlesAtPath(projectPath: String, installPath: String) {`
`145`		`- includeBundlesAtPath(project.findProject(projectPath), installPath)`
	`144`	`+ includeBundlesAtPath(findProject(projectPath), installPath)`
`146`	`145`	`}`
`147`	`146`
`148`	`147`	`fun includeBundlesAtPath(project: Project, installPath: String? = null, runMode: String? = null) {`
`@@ -173,7 +172,7 @@ open class ComposeTask : Zip(), AemTask {`
`173`	`172`	`}`
`174`	`173`
`175`	`174`	`fun includeContent(projectPath: String) {`
`176`		`- includeContent(project.findProject(projectPath))`
	`175`	`+ includeContent(findProject(projectPath))`
`177`	`176`	`}`
`178`	`177`
`179`	`178`	`fun includeContent(project: Project) {`
`@@ -193,8 +192,13 @@ open class ComposeTask : Zip(), AemTask {`
`193`	`192`	`}`
`194`	`193`	`}`
`195`	`194`
	`195`	`+ private fun findProject(projectPath: String) : Project {`
	`196`	`+ return project.findProject(projectPath)`
	`197`	`+ ?: throw AemException("Project cannot be found by path '$projectPath'")`
	`198`	`+ }`
	`199`	`+`
`196`	`200`	`private fun dependProject(projectPath: String, taskNames: Collection<String>) {`
`197`		`- dependProject(project.findProject(projectPath), taskNames)`
	`201`	`+ dependProject(findProject(projectPath), taskNames)`
`198`	`202`	`}`
`199`	`203`
`200`	`204`	`private fun dependProject(project: Project, taskNames: Collection<String>) {`
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,6 @@ bundle {`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`dependencies {`
`22`		`- aemInstall group: 'org.jetbrains.kotlin', name: 'kotlin-osgi-bundle', version: '1.1.4'`
	`22`	`+ aemInstall group: 'org.jetbrains.kotlin', name: 'kotlin-osgi-bundle', version: '1.1.60'`
`23`	`23`	`aemEmbed group: 'org.hashids', name: 'hashids', version: '1.0.1'`
`24`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ repositories {`
`7`	`7`	`}`
`8`	`8`
`9`	`9`	`dependencies {`
`10`		`- classpath 'com.cognifide.gradle:aem-plugin:2.0.11'`
	`10`	`+ classpath 'com.cognifide.gradle:aem-plugin:2.0.12'`
`11`	`11`	`classpath "org.dm.gradle:gradle-bundle-plugin:0.10.0"`
`12`		`- classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.1.4"`
	`12`	`+ classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.1.60"`
`13`	`13`	`}`