upgrade to the latest aem gradle plugin

ahmed-musallam · Jul 1, 2019 · dbe7481 · dbe7481
1 parent 55a813a
commit dbe7481
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 99 deletions.
diff --git a/.gitignore b/.gitignore
@@ -137,7 +137,6 @@ buildNumber.properties
 ### Gradle template
 .gradle
 build/
-/gradle.properties
 
 # Ignore Gradle GUI config
 gradle-app.setting

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -3,12 +3,10 @@ import org.gradle.api.tasks.testing.logging.TestLogEvent
 
 plugins {
     id("com.cognifide.aem.bundle")
-    id("com.cognifide.aem.instance")
-    id("com.neva.fork")
 }
 
 description = "AEM Dialog Editor"
-defaultTasks(":aemSatisfy", ":aemDeploy")
+defaultTasks("packageDeploy")
 
 group = "com.ahmedmusallam.aem"
 version = "1.0.0-SNAPSHOT"
@@ -34,22 +32,3 @@ dependencies {
 
     compileOnly("com.adobe.aem:uber-jar:6.4.0:obfuscated-apis")
 }
-
-tasks {
-    withType<Test>().configureEach {
-        failFast = true
-        useJUnitPlatform()
-        testLogging {
-            events = setOf(TestLogEvent.FAILED)
-            exceptionFormat = TestExceptionFormat.SHORT
-        }
-
-        dependencies {
-            "testImplementation"("org.junit.jupiter:junit-jupiter-api:5.3.2")
-            "testRuntimeOnly"("org.junit.jupiter:junit-jupiter-engine:5.3.2")
-            "testImplementation"("io.wcm:io.wcm.testing.aem-mock.junit5:2.3.2")
-        }
-    }
-}
-
-apply(from = "gradle/fork.gradle.kts")
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -7,7 +7,6 @@ repositories {
 }
 
 dependencies {
-    implementation("com.cognifide.gradle:aem-plugin:6.3.0")
-    implementation("com.neva.gradle:fork-plugin:3.1.1")
+    implementation("com.cognifide.gradle:aem-plugin:7.0.2")
 }
 
diff --git a/gradle.properties b/gradle.properties
@@ -0,0 +1,2 @@
+#instance.name="*-author"
+instance.authors=true
diff --git a/gradle/fork.gradle.kts b/gradle/fork.gradle.kts
diff --git a/gradle/fork/gradle.properties.peb b/gradle/fork/gradle.properties.peb