Merge pull request #156 from Cognifide/develop

Release 3.1.2

Author: pun-ky

README.md

@@ -115,7 +115,7 @@ buildscript {
     }
     
     dependencies {
-        classpath 'com.cognifide.gradle:aem-plugin:3.1.1'
+        classpath 'com.cognifide.gradle:aem-plugin:3.1.2'
     }
 }
 

build.gradle

@@ -6,7 +6,7 @@ plugins {
 }
 
 group 'com.cognifide.gradle'
-version '3.1.1'
+version '3.1.2'
 description = 'Gradle AEM Plugin'
 defaultTasks = ['clean', 'build', 'publishToMavenLocal']
 

src/main/kotlin/com/cognifide/gradle/aem/api/AemConfig.kt

@@ -420,7 +420,7 @@ class AemConfig(
      * Declare new deployment target (AEM instance).
      */
     fun localInstance(httpUrl: String) {
-        instance(LocalInstance.create(httpUrl))
+        localInstance(httpUrl, {})
     }
 
     fun localInstance(httpUrl: String, configurer: LocalInstance.() -> Unit) {
@@ -456,7 +456,7 @@ class AemConfig(
     }
 
     fun remoteInstance(httpUrl: String) {
-        instance(RemoteInstance.create(httpUrl))
+        remoteInstance(httpUrl, {})
     }
 
     fun remoteInstance(httpUrl: String, configurer: RemoteInstance.() -> Unit) {

src/main/kotlin/com/cognifide/gradle/aem/instance/Instance.kt

@@ -124,16 +124,12 @@ interface Instance : Serializable {
             return filter(project, RemoteInstance::class)
         }
 
-        fun portOfUrl(url: String): Int {
-            return URL(url).port
-        }
-
     }
 
     val httpUrl: String
 
     val httpPort: Int
-        get() = portOfUrl(httpUrl)
+        get() = InstanceUrl.parse(httpUrl).httpPort
 
     val user: String
 

src/main/kotlin/com/cognifide/gradle/aem/instance/InstanceType.kt

@@ -21,7 +21,7 @@ enum class InstanceType {
         }
 
         fun byUrl(url: String): InstanceType {
-            return byPort(Instance.portOfUrl(url))
+            return byPort(InstanceUrl.parse(url).httpPort)
         }
 
         fun byPort(port: Int): InstanceType {

src/main/kotlin/com/cognifide/gradle/aem/instance/InstanceUrl.kt

@@ -15,7 +15,22 @@ class InstanceUrl(raw: String) {
         get() = userPart(1) ?: Instance.PASSWORD_DEFAULT
 
     val httpUrl: String
-        get() = "${config.protocol}://${config.host}:${config.port}"
+        get() = if (config.port != -1) {
+            "${config.protocol}://${config.host}:${config.port}"
+        } else {
+            "${config.protocol}://${config.host}"
+        }
+
+    val httpPort: Int
+        get() = if (config.port != -1) {
+            config.port
+        } else {
+            if (config.protocol == "https") {
+                443
+            } else {
+                80
+            }
+        }
 
     val typeName: String
         get() = InstanceType.nameByUrl(httpUrl)
@@ -24,7 +39,15 @@ class InstanceUrl(raw: String) {
         get() = InstanceType.byUrl(httpUrl)
 
     val debugPort: Int
-        get() = "1${Instance.portOfUrl(httpUrl)}".toInt()
+        get() = if (config.port != -1) {
+            "1$httpPort".toInt()
+        } else {
+            if (config.protocol == "https") {
+                50443
+            } else {
+                50080
+            }
+        }
 
     private fun userPart(index: Int): String? {
         return config.userInfo?.split(":")

src/test/resources/com/cognifide/gradle/aem/test/compose/assembly/gradle/buildscript.gradle

@@ -6,7 +6,7 @@ repositories {
 }
 
 dependencies {
-    classpath 'com.cognifide.gradle:aem-plugin:3.1.1'
+    classpath 'com.cognifide.gradle:aem-plugin:3.1.2'
     classpath 'biz.aQute.bnd:biz.aQute.bnd.gradle:3.5.0'
     classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.2.21"
 }

src/test/resources/com/cognifide/gradle/aem/test/compose/bundle-and-content/build.gradle

@@ -6,7 +6,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.cognifide.gradle:aem-plugin:3.1.1'
+        classpath 'com.cognifide.gradle:aem-plugin:3.1.2'
         classpath 'biz.aQute.bnd:biz.aQute.bnd.gradle:3.5.0'
     }
 }

src/test/resources/com/cognifide/gradle/aem/test/debug/build.gradle

@@ -6,7 +6,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.cognifide.gradle:aem-plugin:3.1.1'
+        classpath 'com.cognifide.gradle:aem-plugin:3.1.2'
     }
 }