Feature/improve buildscript

CHANGELOG.md

@@ -7,4 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 
 ### Fixed
-- #258 - Fixed actions which use @Flag annotation
+- #258 - Fixed actions which use @Flag annotation
+
+### Changed
+- #260 - Updated GAP to the latest version. Fixed default task to deploy packages in proper order. Changed antlr and kotlin bundles to private packages 

app/aem/actions.checks/build.gradle.kts

@@ -39,6 +39,10 @@ dependencies {
 }
 
 tasks {
+    getByName("packageDeploy") {
+        mustRunAfter(":app:aem:ui.apps:packageDeploy")
+    }
+
     register<Jar>("sourcesJar") {
         from(sourceSets.main.get().allSource)
         archiveClassifier.set("sources")

app/aem/core/build.gradle.kts

@@ -4,7 +4,7 @@ import org.gradle.jvm.tasks.Jar
 plugins {
     id("com.cognifide.aem.bundle")
     kotlin("jvm")
-    id("org.jetbrains.kotlin.plugin.noarg") version "1.3.70"
+    id("org.jetbrains.kotlin.plugin.noarg") version "1.3.72"
     antlr
     groovy
     java
@@ -32,6 +32,10 @@ aem {
                         ).joinToString(","))
                 attribute("Sling-Nodetypes", "CQ-INF/nodetypes/apm_nodetypes.cnd")
                 attribute("APM-Actions", "com.cognifide.apm.foundation.actions")
+                excludePackage("org.antlr.stringtemplate")
+                embedPackage("org.antlr:antlr4:4.7.2", "org.antlr.v4.*", "org.antlr.runtime.v4.*", "org.antlr.runtime.*", "org.stringtemplate.v4.*", "com.ibm.icu.*", "org.abego.treelayout.*")
+                embedPackage("org.jetbrains.kotlin:kotlin-reflect:1.3.72", "kotlin.reflect.*")
+                embedPackage("org.jetbrains.kotlin:kotlin-stdlib:1.3.72", "kotlin.*")
             }
         }
     }
@@ -48,7 +52,7 @@ dependencies {
     compileOnly("com.cognifide.cq.actions:com.cognifide.cq.actions.api:6.0.2")
 
     compileOnly(kotlin("stdlib-jdk8"))
-    compileOnly(kotlin("osgi-bundle"))
+    compileOnly(kotlin("reflect"))
 }
 
 sourceSets {

app/aem/ui.apps/build.gradle.kts

@@ -13,7 +13,6 @@ apply(from = rootProject.file("app/aem/common.gradle.kts"))
 aem {
     tasks {
         packageCompose {
-            installBundle("org.jetbrains.kotlin:kotlin-osgi-bundle:1.3.72")
             installBundleProject(":app:aem:api")
             installBundleProject(":app:aem:core")
             installBundleProject(":app:aem:actions.main")
@@ -25,6 +24,12 @@ aem {
     }
 }
 
+tasks {
+    getByName("packageDeploy") {
+        mustRunAfter(":env:instanceProvision")
+    }
+}
+
 publishing {
     publications {
         register<MavenPublication>("apmCrx") {

build.gradle.kts

@@ -9,7 +9,7 @@ plugins {
     signing
 }
 
-defaultTasks("instanceSatisfy", ":app:aem:ui.apps:packageDeploy", ":app:aem:actions.checks:packageDeploy")
+defaultTasks("deployAll")
 
 scmVersion {
     useHighestVersion = true
@@ -26,6 +26,9 @@ allprojects {
 }
 
 tasks {
+    register("deployAll") {
+        dependsOn(":env:instanceProvision", ":app:aem:ui.apps:packageDeploy", ":app:aem:actions.checks:packageDeploy")
+    }
     withType<RatTask>().configureEach {
         // Files that don't require a license header
         excludes.add("**/LICENSE")

buildSrc/build.gradle.kts

@@ -32,5 +32,5 @@ dependencies {
     implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72")
     implementation("org.apache.sling:org.apache.sling.caconfig.bnd-plugin:1.0.2")
     implementation("com.cognifide.gradle:environment-plugin:0.1.12")
-    implementation("com.cognifide.gradle:aem-plugin:13.2.1")
+    implementation("com.cognifide.gradle:aem-plugin:14.2.13")
 }

env/build.gradle.kts

@@ -4,10 +4,8 @@ plugins {
 
 aem {
     instance {
-        satisfier {
-            packages {
-                "cq.actions"("https://github.com/Cognifide/APM/releases/download/apm-4.3.0/cq-actions-msg-replication-6.4.0.zip")
-            }
+        provisioner {
+            deployPackage("https://github.com/Cognifide/APM/releases/download/apm-4.3.0/cq-actions-msg-replication-6.4.0.zip")
         }
     }
 }