moved gradle plugin to buildSrc

Foso · Foso · commit 8e1c5323d700 · 2019-09-01T17:34:14.000+02:00
diff --git a/Contact.md b/Contact.md
@@ -2,6 +2,6 @@ Created by Jens Klingenberg
 * www.jensklingenberg.de
 
 
-Feel free to contact me:
+Contact:
 * Mail: mail@jensklingenberg.de
 * Twitter: [@jklingenberg_](https://twitter.com/jklingenberg_)
diff --git a/annotations/build.gradle b/annotations/build.gradle
@@ -40,7 +40,6 @@ kotlin {
         commonMain {
             dependencies {
                 implementation kotlin('stdlib-common')
-                implementation "io.ktor:ktor-client-core:1.2.3"
 
             }
         }
@@ -54,7 +53,6 @@ kotlin {
         jsMain {
             dependencies {
                 implementation kotlin('stdlib-js')
-                implementation "io.ktor:ktor-client-js:1.2.3"
 
             }
         }
@@ -67,7 +65,6 @@ kotlin {
         jvmMain {
             dependencies {
                 implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
-                implementation "io.ktor:ktor-client-okhttp:1.2.3"
             }
         }
         jsTest {
@@ -80,15 +77,6 @@ kotlin {
 }
 
 
-task hello3(type: Exec) {
-    doFirst {
-        println 'start gradle....'
-    }
-    commandLine 'gradle',':annotations:install'
-    doLast {
-        println 'end gradle....'
-    }
-}
 
 
 build.finalizedBy(publishToMavenLocal)
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
@@ -1,3 +1,27 @@
+buildscript {
+    ext.kotlin_version = '1.3.50'
+
+
+    repositories {
+        mavenCentral()
+
+        jcenter()
+    }
+    dependencies {
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath 'com.github.jengelman.gradle.plugins:shadow:5.0.0'
+    }
+
+    allprojects {
+        repositories {
+            mavenCentral()
+            mavenLocal()
+            jcenter()
+        }
+    }
+}
+
+
 plugins {
     id 'org.jetbrains.kotlin.jvm' version '1.3.50'
 }
@@ -10,22 +34,8 @@ group = "de.jensklingenberg"
 archivesBaseName = "mpapt-gradle"
 version = "1.0.0"
 
-repositories {
-    // The org.jetbrains.kotlin.jvm plugin requires a repository
-    // where to download the Kotlin compiler dependencies from.
-    jcenter()
-}
 
 
-allprojects {
-    repositories {
-        mavenLocal()
-        mavenCentral()
-        maven { url "https://maven.google.com" }
-        maven { url "https://plugins.gradle.org/m2/" }
-    }
-}
-
 install {
     repositories.mavenInstaller {
         pom.artifactId = 'mpapt-gradle'
@@ -43,7 +53,12 @@ gradlePlugin {
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
-    implementation "org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.3.50"
+    compile "org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.3.50"
     compileOnly "com.google.auto.service:auto-service:1.0-rc6"
     kapt "com.google.auto.service:auto-service:1.0-rc6"
 }
+
+
+build {
+    dependsOn install
+}
diff --git a/buildSrc/src/main/kotlin/de/jensklingenberg/mpapt/MpAptGradlePlugin.kt b/buildSrc/src/main/kotlin/de/jensklingenberg/mpapt/MpAptGradlePlugin.kt
@@ -4,10 +4,7 @@ import org.gradle.api.Project
 
 open class MpAptGradlePlugin : org.gradle.api.Plugin<Project> {
     override fun apply(project: Project) {
-        project.extensions.create(
-                "ktorfit",
-                TestCompilerExtension::class.java
-        )
+
     }
 }
 
diff --git a/buildSrc/src/main/kotlin/de/jensklingenberg/mpapt/MpAptGradleSubplugin.kt b/buildSrc/src/main/kotlin/de/jensklingenberg/mpapt/MpAptGradleSubplugin.kt
@@ -23,7 +23,7 @@ class MpAptGradleSubplugin : KotlinGradleSubplugin<AbstractCompile> {
                 ?: TestCompilerExtension()
 
         val enabledOption = SubpluginOption(key = "enabled", value = extension.enabled.toString())
-        return listOf(enabledOption)
+        return emptyList()
 
     }
 
@@ -42,9 +42,9 @@ class MpAptGradleSubplugin : KotlinGradleSubplugin<AbstractCompile> {
             version = "0.0.1" // remember to bump this version before any release!
     )
 
-    override fun getNativeCompilerPluginArtifact()=SubpluginArtifact(
-    groupId = "de.jensklingenberg",
-    artifactId = "kotlin-compiler-native-plugin",
-    version = "0.0.1" // remember to bump this version before any release!
+    override fun getNativeCompilerPluginArtifact() = SubpluginArtifact(
+            groupId = "de.jensklingenberg",
+            artifactId = "kotlin-compiler-native-plugin",
+            version = "0.0.1" // remember to bump this version before any release!
     )
 }
diff --git a/example/build.gradle b/example/build.gradle
@@ -17,7 +17,6 @@ buildscript {
 
 }
 
-
 plugins {
     id 'org.jetbrains.kotlin.multiplatform' version '1.3.50'
 }
@@ -70,7 +69,6 @@ kotlin {
         commonMain {
             dependencies {
                 implementation kotlin('stdlib-common')
-                implementation "io.ktor:ktor-client-core:1.2.3"
                 implementation project(":annotations")
 
             }
@@ -86,7 +84,6 @@ kotlin {
         jsMain {
             dependencies {
                 implementation kotlin('stdlib-js')
-                implementation "io.ktor:ktor-client-js:1.2.3"
 
             }
         }
@@ -99,7 +96,6 @@ kotlin {
         jvmMain {
             dependencies {
                 implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
-                implementation "io.ktor:ktor-client-okhttp:1.2.3"
             }
         }
         jvmTest {
@@ -120,15 +116,6 @@ kotlin {
 }
 
 
-build {
-
-    dependsOn ':kotlin-plugin:install'
-
-    dependsOn ':gradle-plugin:install'
-    dependsOn ':kotlin-compiler-native-plugin:build'
-
-
-}
 
 // workaround for https://youtrack.jetbrains.com/issue/KT-27170
 configurations {
diff --git a/gradle.properties b/gradle.properties
@@ -5,7 +5,7 @@ org.gradle.configureondemand=false
 kotlin.compiler.execution.strategy=in-process
 kotlin.daemon.debug.log=true
 org.gradle.jvmargs=-Xmx6g -XX:MaxPermSize=1024m
-kotlin.native.jvmArgs=-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5006
+//kotlin.native.jvmArgs=-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5006
 gnsp.disableApplyOnlyOnRootProjectEnforcement
 
 SONATYPE_NEXUS_USERNAME=
diff --git a/kotlin-compiler-native-plugin/build.gradle b/kotlin-compiler-native-plugin/build.gradle
@@ -101,9 +101,14 @@ kapt {
 
 install{
     dependsOn(shadowJar)
+
 }
 
 build{
+    dependsOn ':kotlin-plugin-shared:install'
+
    dependsOn(shadowJar)
+
+
     finalizedBy(publishToMavenLocal)
 }
diff --git a/kotlin-plugin-shared/build.gradle b/kotlin-plugin-shared/build.gradle
@@ -29,6 +29,8 @@ archivesBaseName = "kotlin-plugin-shared"
 version = "0.0.1"
 
 install {
+    dependsOn ':mpapt-runtime:install'
+
     repositories.mavenInstaller {
         pom.artifactId = archivesBaseName
     }
@@ -40,7 +42,7 @@ repositories {
 }
 
 dependencies {
-    compile 'de.jensklingenberg:mpapt-runtime:0.8.0'
+    compile project(':mpapt-runtime')
     compile "de.jensklingenberg.mpapt.testAnnotations:annotations-jvm:0.0.1"
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
     compileOnly "org.jetbrains.kotlin:kotlin-compiler-embeddable"
diff --git a/kotlin-plugin-shared/src/main/java/de/jensklingenberg/MpAptTestProcessor.kt b/kotlin-plugin-shared/src/main/java/de/jensklingenberg/MpAptTestProcessor.kt
@@ -12,6 +12,7 @@ import org.jetbrains.kotlin.resolve.descriptorUtil.module
 class MpAptTestProcessor(configuration: CompilerConfiguration) : AbstractProcessor(configuration) {
     val TAG = "MyAnnotationProcessor"
 
+    val testFunction = TestFunction::class.java.name
     val testProperty = TestProperty::class.java.name
     val testValueParameter = TestValueParameter::class.java.name
     val testPropertyGetter = TestPropertyGetter::class.java.name
@@ -82,7 +83,7 @@ class MpAptTestProcessor(configuration: CompilerConfiguration) : AbstractProcess
     }
 
 
-    override fun getSupportedAnnotationTypes(): Set<String> = setOf(TestClass::class.java.name, TestFunction::class.java.name)
+    override fun getSupportedAnnotationTypes(): Set<String> = setOf(TestClass::class.java.name, testFunction, testProperty,testValueParameter,testPropertyGetter,testPropertySetter,testConstructor,testLocalVariable)
 
     override fun processingOver() {
         log("$TAG***Processor over ***")
diff --git a/settings.gradle b/settings.gradle
@@ -1,4 +1,4 @@
-include ':gradle-plugin'
+
 include 'annotations'
 include 'example'
 include ':kotlin-compiler-native-plugin'

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,6 @@ kotlin {`
`40`	`40`	`commonMain {`
`41`	`41`	`dependencies {`
`42`	`42`	`implementation kotlin('stdlib-common')`
`43`		`- implementation "io.ktor:ktor-client-core:1.2.3"`
`44`	`43`
`45`	`44`	`}`
`46`	`45`	`}`
`@@ -54,7 +53,6 @@ kotlin {`
`54`	`53`	`jsMain {`
`55`	`54`	`dependencies {`
`56`	`55`	`implementation kotlin('stdlib-js')`
`57`		`- implementation "io.ktor:ktor-client-js:1.2.3"`
`58`	`56`
`59`	`57`	`}`
`60`	`58`	`}`
`@@ -67,7 +65,6 @@ kotlin {`
`67`	`65`	`jvmMain {`
`68`	`66`	`dependencies {`
`69`	`67`	`implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"`
`70`		`- implementation "io.ktor:ktor-client-okhttp:1.2.3"`
`71`	`68`	`}`
`72`	`69`	`}`
`73`	`70`	`jsTest {`
`@@ -80,15 +77,6 @@ kotlin {`
`80`	`77`	`}`
`81`	`78`
`82`	`79`
`83`		`-task hello3(type: Exec) {`
`84`		`- doFirst {`
`85`		`- println 'start gradle....'`
`86`		`- }`
`87`		`- commandLine 'gradle',':annotations:install'`
`88`		`- doLast {`
`89`		`- println 'end gradle....'`
`90`		`- }`
`91`		`-}`
`92`	`80`
`93`	`81`
`94`	`82`	`build.finalizedBy(publishToMavenLocal)`
Original file line number	Diff line number	Diff line change
`@@ -4,10 +4,7 @@ import org.gradle.api.Project`
`4`	`4`
`5`	`5`	`open class MpAptGradlePlugin : org.gradle.api.Plugin<Project> {`
`6`	`6`	`override fun apply(project: Project) {`
`7`		`- project.extensions.create(`
`8`		`- "ktorfit",`
`9`		`- TestCompilerExtension::class.java`
`10`		`- )`
	`7`	`+`
`11`	`8`	`}`
`12`	`9`	`}`
`13`	`10`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ class MpAptGradleSubplugin : KotlinGradleSubplugin<AbstractCompile> {`
`23`	`23`	`?: TestCompilerExtension()`
`24`	`24`
`25`	`25`	`val enabledOption = SubpluginOption(key = "enabled", value = extension.enabled.toString())`
`26`		`- return listOf(enabledOption)`
	`26`	`+ return emptyList()`
`27`	`27`
`28`	`28`	`}`
`29`	`29`
`@@ -42,9 +42,9 @@ class MpAptGradleSubplugin : KotlinGradleSubplugin<AbstractCompile> {`
`42`	`42`	`version = "0.0.1" // remember to bump this version before any release!`
`43`	`43`	`)`
`44`	`44`
`45`		`- override fun getNativeCompilerPluginArtifact()=SubpluginArtifact(`
`46`		`- groupId = "de.jensklingenberg",`
`47`		`- artifactId = "kotlin-compiler-native-plugin",`
`48`		`- version = "0.0.1" // remember to bump this version before any release!`
	`45`	`+ override fun getNativeCompilerPluginArtifact() = SubpluginArtifact(`
	`46`	`+ groupId = "de.jensklingenberg",`
	`47`	`+ artifactId = "kotlin-compiler-native-plugin",`
	`48`	`+ version = "0.0.1" // remember to bump this version before any release!`
`49`	`49`	`)`
`50`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,6 @@ buildscript {`
`17`	`17`
`18`	`18`	`}`
`19`	`19`
`20`		`-`
`21`	`20`	`plugins {`
`22`	`21`	`id 'org.jetbrains.kotlin.multiplatform' version '1.3.50'`
`23`	`22`	`}`
`@@ -70,7 +69,6 @@ kotlin {`
`70`	`69`	`commonMain {`
`71`	`70`	`dependencies {`
`72`	`71`	`implementation kotlin('stdlib-common')`
`73`		`- implementation "io.ktor:ktor-client-core:1.2.3"`
`74`	`72`	`implementation project(":annotations")`
`75`	`73`
`76`	`74`	`}`
`@@ -86,7 +84,6 @@ kotlin {`
`86`	`84`	`jsMain {`
`87`	`85`	`dependencies {`
`88`	`86`	`implementation kotlin('stdlib-js')`
`89`		`- implementation "io.ktor:ktor-client-js:1.2.3"`
`90`	`87`
`91`	`88`	`}`
`92`	`89`	`}`
`@@ -99,7 +96,6 @@ kotlin {`
`99`	`96`	`jvmMain {`
`100`	`97`	`dependencies {`
`101`	`98`	`implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"`
`102`		`- implementation "io.ktor:ktor-client-okhttp:1.2.3"`
`103`	`99`	`}`
`104`	`100`	`}`
`105`	`101`	`jvmTest {`
`@@ -120,15 +116,6 @@ kotlin {`
`120`	`116`	`}`
`121`	`117`
`122`	`118`
`123`		`-build {`
`124`		`-`
`125`		`- dependsOn ':kotlin-plugin:install'`
`126`		`-`
`127`		`- dependsOn ':gradle-plugin:install'`
`128`		`- dependsOn ':kotlin-compiler-native-plugin:build'`
`129`		`-`
`130`		`-`
`131`		`-}`
`132`	`119`
`133`	`120`	`// workaround for https://youtrack.jetbrains.com/issue/KT-27170`
`134`	`121`	`configurations {`
Original file line number	Diff line number	Diff line change
`@@ -101,9 +101,14 @@ kapt {`
`101`	`101`
`102`	`102`	`install{`
`103`	`103`	`dependsOn(shadowJar)`
	`104`	`+`
`104`	`105`	`}`
`105`	`106`
`106`	`107`	`build{`
	`108`	`+ dependsOn ':kotlin-plugin-shared:install'`
	`109`	`+`
`107`	`110`	`dependsOn(shadowJar)`
	`111`	`+`
	`112`	`+`
`108`	`113`	`finalizedBy(publishToMavenLocal)`
`109`	`114`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-include ':gradle-plugin'`
	`1`	`+`
`2`	`2`	`include 'annotations'`
`3`	`3`	`include 'example'`
`4`	`4`	`include ':kotlin-compiler-native-plugin'`