Decoupling plugin from buildScript (#47)

* Moved the plugin on its standalone module to be able to publish
* Refactor and clean up
* Gradle wrapper upgrade
* put back warnings as error
* Build sample using in repo plugin
* Extracted Kmp setup in utils.gradle

.gitignore

@@ -13,9 +13,9 @@ hs_err_pid*
 # Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
 
 # User-specific stuff
-.idea/*
-!.idea/codeStyles/
-!.idea/copyright/
+**/.idea/*
+!**.idea/codeStyles/
+!**.idea/copyright/
 
 local.properties
 

build.gradle

@@ -20,8 +20,6 @@ buildscript {
     repositories {
         google()
         mavenCentral()
-        maven { url "https://kotlin.bintray.com/kotlinx" }
-        maven { url "https://plugins.gradle.org/m2/" }
     }
     dependencies {
         classpath libs.kotlinx.atomicfu.gradle
@@ -36,82 +34,11 @@ allprojects {
     repositories {
         mavenCentral()
         google()
-        maven { url "https://kotlin.bintray.com/kotlinx" }
-        maven { url "https://plugins.gradle.org/m2/" }
     }
 
     tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
-        kotlinOptions.allWarningsAsErrors = true
-    }
-}
-
-void setupMultiplatformLibrary(Project project, Boolean shouldPublish = true) {
-    project.apply plugin: 'org.jetbrains.kotlin.multiplatform'
-    if (shouldPublish) {
-        project.apply from: '../publishing.gradle'
-    }
-
-    project.group = GROUP
-    project.version = VERSION
-
-    project.kotlin {
-        sourceSets {
-            commonTest {
-                dependencies {
-                    implementation libs.kotlin.test
-                    implementation libs.kotlin.test.annotations
-                }
-            }
-        }
-    }
-}
-
-void setupAllTargetsWithDefaultSourceSets(Project project) {
-    setupIosTargets(project)
-    setupJvmTarget(project)
-    setupJsTarget(project)
-
-    project.kotlin {
-        sourceSets {
-            jvmJsCommonMain.dependsOn commonMain
-            jvmJsCommonTest.dependsOn commonTest
-
-            jvmMain.dependsOn jvmJsCommonMain
-            jvmTest.dependsOn jvmJsCommonTest
-
-            jsMain.dependsOn jvmJsCommonMain
-            jsTest.dependsOn jvmJsCommonTest
+        kotlinOptions{
+            allWarningsAsErrors = true
         }
     }
-}
-
-private void setupIosTargets(Project project) {
-    project.kotlin {
-        targets.fromPreset(presets.iosX64, 'iosX64')
-        targets.fromPreset(presets.iosArm64, 'iosArm64')
-    }
-}
-
-private void setupJvmTarget(Project project) {
-    project.kotlin {
-        targets.fromPreset(presets.jvm, 'jvm')
-
-        sourceSets {
-            jvmMain {
-                dependencies {
-
-                }
-            }
-
-            jvmTest {
-                dependencies {
-                    implementation libs.junit.junit
-                }
-            }
-        }
-    }
-}
-
-private void setupJsTarget(Project project) {
-    project.apply plugin: JsPlugin
 }

buildSrc/build.gradle.kts

@@ -22,35 +22,8 @@ repositories {
     mavenCentral()
     google()
     gradlePluginPortal()
-    maven {
-        url = uri(project.properties["careem_artifactory_url"] as String? ?: System.getenv("careem_artifactory_url"))
-        credentials {
-            username = project.properties["careem_artifactory_username"] as String? ?: System.getenv("careem_artifactory_username")
-            password = project.properties["careem_artifactory_api_key"] as String? ?: System.getenv("careem_artifactory_api_key")
-        }
-        content {
-            includeGroup("com.careem.mockingbird")
-        }
-        mavenContent {
-            releasesOnly()
-        }
-    }
 }
 
 dependencies {
     implementation(libs.kotlin.gradle)
-    implementation(libs.kotlin.reflectjvm)
-    implementation(libs.square.kotlinpoet)
-    implementation(libs.square.kotlinpoet.metadata)
-    implementation(libs.square.kotlinpoet.metadata.specs)
-    implementation(libs.kotlinx.metadatajvm)
-    implementation(libs.careem.mockingbird) // FIXME avoid this dep but use project dep instead
-}
-
-kotlin {
-    // Add Deps to compilation, so it will become available in main project
-    sourceSets.getByName("main").kotlin.srcDirs(
-        "buildSrc/src/main/kotlin"
-    )
-    println("ROOT:${rootProject.allprojects}")
 }

mockingbird-compiler/build.gradle.kts

@@ -20,6 +20,8 @@ plugins {
     `kotlin-dsl`
 }
 
+apply(from = "../publishing.gradle")
+
 gradlePlugin {
     plugins {
         register("mockingbird") {
@@ -35,38 +37,17 @@ repositories {
     gradlePluginPortal()
 }
 
-kotlin {
-    // Add Deps to compilation, so it will become available in main project
-    sourceSets.getByName("main").kotlin.srcDirs("buildSrc/src/main/kotlin")
-    println("ROOT:${rootProject.allprojects}")
+tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
+    kotlinOptions.freeCompilerArgs += "-Xopt-in=kotlin.RequiresOptIn"
 }
 
 dependencies {
     implementation(libs.kotlin.gradle)
+    implementation(libs.kotlin.reflectjvm)
     implementation(libs.square.kotlinpoet)
     implementation(libs.square.kotlinpoet.metadata)
     implementation(libs.square.kotlinpoet.metadata.specs)
     implementation(libs.kotlinx.metadatajvm)
+    implementation(project(":mockingbird"))
 }
 
-//task pluginVersion {
-//    def outputDir = file("gen")
-//
-//    inputs.property 'version', version
-//    outputs.dir outputDir
-//
-//    doLast {
-//        def versionFile = file("$outputDir/com/squareup/sqldelight/Version.kt")
-//        versionFile.parentFile.mkdirs()
-//        versionFile.text = """// Generated file. Do not edit!
-//package com.squareup.sqldelight
-//
-//val VERSION = "${project.version}"
-//"""
-//    }
-//}
-//
-//tasks.getByName('compileKotlin').dependsOn('pluginVersion')
-//
-//apply from: "$rootDir/gradle/gradle-mvn-push.gradle"
-

buildSrc/src/main/kotlin/MockingbirdPlugin.kt → mockingbird-compiler/src/main/kotlin/com/careem/mockingbird/MockingbirdPlugin.kt

@@ -13,7 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+package com.careem.mockingbird
 
+import com.squareup.kotlinpoet.DelicateKotlinPoetApi
 import com.squareup.kotlinpoet.FileSpec
 import com.squareup.kotlinpoet.FunSpec
 import com.squareup.kotlinpoet.KModifier
@@ -107,6 +109,8 @@ abstract class MockingbirdPlugin : Plugin<Project> {
         }
     }
 
+
+    @OptIn(DelicateKotlinPoetApi::class)
     private fun generateMockClassFor(project: Project, kmClass: ImmutableKmClass) {
         val classToMock = Thread.currentThread().contextClassLoader.loadClass(
             kmClass.name.replace(
@@ -124,6 +128,7 @@ abstract class MockingbirdPlugin : Plugin<Project> {
 
         // TODO fix package name
         println("Generating mocks for $simpleName")
+
         val mockClassBuilder = TypeSpec.classBuilder("${simpleName}Mock")
             .addType(kmClass.buildMethodObject())
             .addType(kmClass.buildArgObject())

buildSrc/src/main/kotlin/MockingbirdPluginExtension.kt → mockingbird-compiler/src/main/kotlin/com/careem/mockingbird/MockingbirdPluginExtension.kt

@@ -1,12 +1,3 @@
-import org.gradle.api.model.ObjectFactory
-import org.gradle.api.provider.ListProperty
-import org.gradle.kotlin.dsl.getValue
-import org.gradle.kotlin.dsl.listProperty
-import org.gradle.kotlin.dsl.property
-import org.gradle.kotlin.dsl.provideDelegate
-import org.gradle.kotlin.dsl.setValue
-import kotlin.reflect.KProperty
-
 /*
  * Copyright Careem, an Uber Technologies Inc. company
  *
@@ -22,6 +13,16 @@ import kotlin.reflect.KProperty
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+package com.careem.mockingbird
+
+import org.gradle.api.model.ObjectFactory
+import org.gradle.api.provider.ListProperty
+import org.gradle.kotlin.dsl.getValue
+import org.gradle.kotlin.dsl.listProperty
+import org.gradle.kotlin.dsl.property
+import org.gradle.kotlin.dsl.provideDelegate
+import org.gradle.kotlin.dsl.setValue
+import kotlin.reflect.KProperty
 
 interface MockingbirdPluginExtension {
     var generateMocksFor: List<String>
@@ -39,7 +40,7 @@ internal class MockingbirdPluginExtensionImpl(objects: ObjectFactory) : Mockingb
     override var printLogs: Boolean by _printLogs // TODO implement this
 }
 
-internal inline operator fun <T> ListProperty<T>.setValue(scope: Any, property: KProperty<*>, value: List<T>) =
+internal operator fun <T> ListProperty<T>.setValue(scope: Any, property: KProperty<*>, value: List<T>) =
     set(value)
 
-internal inline operator fun <T> ListProperty<T>.getValue(scope: Any, property: KProperty<*>): List<T> = get()
+internal operator fun <T> ListProperty<T>.getValue(scope: Any, property: KProperty<*>): List<T> = get()

mockingbird/build.gradle

@@ -14,8 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-setupMultiplatformLibrary(project)
-setupAllTargetsWithDefaultSourceSets(project)
+
+apply from: '../utils.gradle'
+
+setupMultiplatformLibrary(project, true)
+setupAllTargetsWithDefaultSourceSets(project, true)
 
 kotlin {
     explicitApi()