Make plugin compatible with Kotlin Script

buildSrc/src/main/kotlin/com/datadog/gradle/config/MavenConfig.kt

@@ -37,7 +37,7 @@ fun Project.publishingConfig(projectDescription: String) {
     signingExtension.apply {
         val privateKey = System.getenv("GPG_PRIVATE_KEY")
         val password = System.getenv("GPG_PASSWORD")
-        isRequired = !hasProperty("dd-skip-signing")
+        isRequired = System.getenv("CI").toBoolean()
         useInMemoryPgpKeys(privateKey, password)
         // com.gradle.plugin-publish plugin will automatically add signing task "signPluginMavenPublication"
         // sign(publishingExtension.publications.getByName(MavenConfig.PUBLICATION))

dd-sdk-android-gradle-plugin/src/main/kotlin/com/datadog/gradle/plugin/DdExtension.kt

@@ -25,13 +25,36 @@ open class DdExtension(
     /**
      * Container for the variant's configurations.
      */
-    internal val variants =
-        objectFactory.domainObjectContainer(DdExtensionConfiguration::class.java)
+    internal val variants = objectFactory.domainObjectContainer(DdExtensionConfiguration::class.java)
 
     /**
-     * Closure method to create a DSL for variant configurations.
+     * Closure method to create a groovy DSL for variant configurations.
      */
     fun variants(configureClosure: Closure<DdExtensionConfiguration>) {
         variants.configure(configureClosure)
     }
+
+    /**
+     * Method compatible with Kotlin Script to create a DSL for variant configurations.
+     */
+    fun variants(configure: VariantScope.() -> Unit) {
+        configure(VariantScope())
+    }
+
+    /**
+     * Inner class used for Kotlin DSL.
+     */
+    inner class VariantScope {
+
+        /**
+         * Defines a new named object, which will be created and configured when it is required.
+         * @param name the name of the variant to configure
+         * @param configuration the action to run to configure the variant
+         */
+        fun register(name: String, configuration: DdExtensionConfiguration.() -> Unit) {
+            variants.register(name) {
+                configuration(it)
+            }
+        }
+    }
 }

samples/variants-kotlin/.gitignore

@@ -0,0 +1 @@
+/build

samples/variants-kotlin/build.gradle.kts

@@ -0,0 +1,107 @@
+import com.datadog.gradle.config.AndroidConfig
+import com.datadog.gradle.plugin.DdExtensionConfiguration
+
+plugins {
+    id("com.android.application")
+    id("kotlin-android")
+//    id("com.datadoghq.dd-sdk-android-gradle-plugin")
+}
+
+
+android {
+    compileSdk = AndroidConfig.TARGET_SDK
+    buildToolsVersion = AndroidConfig.BUILD_TOOLS_VERSION
+
+    namespace = "com.datadog.example.variants.kotlin"
+    defaultConfig {
+        applicationId = "com.datadog.example.variants.kotlin"
+
+        minSdk = AndroidConfig.MIN_SDK
+        targetSdk = AndroidConfig.TARGET_SDK
+        versionCode = 1
+        versionName = "1.0"
+        multiDexEnabled = true
+    }
+
+    buildTypes {
+        release {
+            isMinifyEnabled = true
+            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
+        }
+    }
+
+
+    sourceSets.named("main") {
+        java.srcDir("src/main/kotlin")
+    }
+
+    flavorDimensions.add("version")
+    flavorDimensions.add("colour")
+    productFlavors {
+        register("demo") {
+            dimension = "version"
+            applicationIdSuffix = ".demo"
+            versionNameSuffix = "-demo"
+        }
+        register("full") {
+            dimension = "version"
+            applicationIdSuffix = ".full"
+            versionNameSuffix = "-full"
+        }
+        register("pro") {
+            dimension = "version"
+            applicationIdSuffix = ".pro"
+            versionNameSuffix = "-pro"
+        }
+
+        register("red") {
+            dimension = "colour"
+        }
+        register("green") {
+            dimension = "colour"
+        }
+        register("blue") {
+            dimension = "colour"
+        }
+    }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+
+    kotlinOptions {
+        jvmTarget = "17"
+    }
+}
+
+dependencies {
+    implementation(project(":samples:lib-module"))
+    implementation(libs.kotlin)
+
+    implementation(libs.androidx.core)
+    implementation(libs.androidx.appcompat)
+    implementation(libs.androidx.constraintlayout)
+
+}
+
+/*
+datadog {
+    site = "US"
+    checkProjectDependencies = com.datadog.gradle.plugin.SdkCheckLevel.FAIL
+    mappingFilePath = "path/to/mapping.txt"
+
+    variants {
+        register("demo") {
+            site = "US3"
+            versionName = "demo"
+        }
+        register("full") {
+            versionName = "full"
+        }
+        register("pro") {
+            versionName = "pro"
+        }
+    }
+}
+*/

samples/variants-kotlin/proguard-rules.pro

@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.kts.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile

samples/variants-kotlin/src/demo/java/com/datadog/example/variants/VaryingClass.kt

@@ -0,0 +1,5 @@
+package com.datadog.example.variants
+
+internal class VaryingClass : VaryingInfo {
+    override fun getName(): String = "demo"
+}

samples/variants-kotlin/src/full/java/com/datadog/example/variants/VaryingClass.kt

@@ -0,0 +1,5 @@
+package com.datadog.example.variants
+
+internal class VaryingClass : VaryingInfo {
+    override fun getName(): String = "full"
+}

samples/variants-kotlin/src/main/AndroidManifest.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Unless explicitly stated otherwise all files in this repository are licensed under the Apache License Version 2.0.
+  ~ This product includes software developed at Datadog (https://www.datadoghq.com/).
+  ~ Copyright 2020-Present Datadog, Inc.
+  -->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="com.datadog.example.variants">
+
+    <application
+        android:allowBackup="true"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        android:roundIcon="@mipmap/ic_launcher_round"
+        android:supportsRtl="true"
+        android:theme="@style/AppTheme">
+        <activity android:name=".MainActivity" android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+
+                <category android:name="android.intent.category.LAUNCHER"/>
+            </intent-filter>
+        </activity>
+    </application>
+
+</manifest>

samples/variants-kotlin/src/main/java/com/datadog/example/variants/MainActivity.kt

@@ -0,0 +1,23 @@
+package com.datadog.example.variants
+
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
+import com.datadog.example.variants.ext.toast
+
+/**
+ * Main Activity for the sample app.
+ */
+class MainActivity : AppCompatActivity() {
+
+    private val varyingClass: VaryingInfo = VaryingClass()
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_main)
+    }
+
+    override fun onResume() {
+        super.onResume()
+        toast("Hello World, with ${varyingClass.getName()}")
+    }
+}

samples/variants-kotlin/src/main/java/com/datadog/example/variants/VaryingInfo.kt

@@ -0,0 +1,5 @@
+package com.datadog.example.variants
+
+internal interface VaryingInfo {
+    fun getName(): String
+}

samples/variants-kotlin/src/main/kotlin/com/datadog/example/variants/ext/ActivityExt.kt

@@ -0,0 +1,8 @@
+package com.datadog.example.variants.ext
+
+import android.app.Activity
+import android.widget.Toast
+
+internal fun Activity.toast(message: String) {
+    Toast.makeText(this, message, Toast.LENGTH_LONG).show()
+}

samples/variants-kotlin/src/main/res/drawable-v24/ic_launcher_foreground.xml

@@ -0,0 +1,37 @@
+<!--
+  ~ Unless explicitly stated otherwise all files in this repository are licensed under the Apache License Version 2.0.
+  ~ This product includes software developed at Datadog (https://www.datadoghq.com/).
+  ~ Copyright 2020-Present Datadog, Inc.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:aapt="http://schemas.android.com/aapt"
+        android:width="108dp"
+        android:height="108dp"
+        android:viewportWidth="108"
+        android:viewportHeight="108">
+    <path
+        android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
+        <aapt:attr name="android:fillColor">
+            <gradient
+                android:endX="85.84757"
+                android:endY="92.4963"
+                android:startX="42.9492"
+                android:startY="49.59793"
+                android:type="linear">
+                <item
+                    android:color="#44000000"
+                    android:offset="0.0"/>
+                <item
+                    android:color="#00000000"
+                    android:offset="1.0"/>
+            </gradient>
+        </aapt:attr>
+    </path>
+    <path
+        android:fillColor="#FFFFFF"
+        android:fillType="nonZero"
+        android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
+        android:strokeWidth="1"
+        android:strokeColor="#00000000"/>
+</vector>

samples/variants-kotlin/src/main/res/drawable/ic_launcher_background.xml

@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Unless explicitly stated otherwise all files in this repository are licensed under the Apache License Version 2.0.
+  ~ This product includes software developed at Datadog (https://www.datadoghq.com/).
+  ~ Copyright 2020-Present Datadog, Inc.
+  -->
+
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+    <path android:fillColor="#3DDC84"
+          android:pathData="M0,0h108v108h-108z"/>
+    <path android:fillColor="#00000000" android:pathData="M9,0L9,108"
+          android:strokeWidth="0.8" android:strokeColor="#33FFFFFF"/>
+    <path android:fillColor="#00000000" android:pathData="M19,0L19,108"
+          android:strokeWidth="0.8" android:strokeColor="#33FFFFFF"/>
+    <path android:fillColor="#00000000" android:pathData="M29,0L29,108"
+          android:strokeWidth="0.8" android:strokeColor="#33FFFFFF"/>
+    <path android:fillColor="#00000000" android:pathData="M39,0L39,108"
+          android:strokeWidth="0.8" android:strokeColor="#33FFFFFF"/>
+    <path android:fillColor="#00000000" android:pathData="M49,0L49,108"
+          android:strokeWidth="0.8" android:strokeColor="#33FFFFFF"/>
+    <path android:fillColor="#00000000" android:pathData="M59,0L59,108"
+          android:strokeWidth="0.8" android:strokeColor="#33FFFFFF"/>
+    <path android:fillColor="#00000000" android:pathData="M69,0L69,108"
+          android:strokeWidth="0.8" android:strokeColor="#33FFFFFF"/>
+    <path android:fillColor="#00000000" android:pathData="M79,0L79,108"
+          android:strokeWidth="0.8" android:strokeColor="#33FFFFFF"/>
+    <path android:fillColor="#00000000" android:pathData="M89,0L89,108"
+          android:strokeWidth="0.8" android:strokeColor="#33FFFFFF"/>
+    <path android:fillColor="#00000000" android:pathData="M99,0L99,108"
+          android:strokeWidth="0.8" android:strokeColor="#33FFFFFF"/>
+    <path android:fillColor="#00000000" android:pathData="M0,9L108,9"
+          android:strokeWidth="0.8" android:strokeColor="#33FFFFFF"/>
+    <path android:fillColor="#00000000" android:pathData="M0,19L108,19"
+          android:strokeWidth="0.8" android:strokeColor="#33FFFFFF"/>
+    <path android:fillColor="#00000000" android:pathData="M0,29L108,29"
+          android:strokeWidth="0.8" android:strokeColor="#33FFFFFF"/>
+    <path android:fillColor="#00000000" android:pathData="M0,39L108,39"
+          android:strokeWidth="0.8" android:strokeColor="#33FFFFFF"/>
+    <path android:fillColor="#00000000" android:pathData="M0,49L108,49"
+          android:strokeWidth="0.8" android:strokeColor="#33FFFFFF"/>
+    <path android:fillColor="#00000000" android:pathData="M0,59L108,59"
+          android:strokeWidth="0.8" android:strokeColor="#33FFFFFF"/>
+    <path android:fillColor="#00000000" android:pathData="M0,69L108,69"
+          android:strokeWidth="0.8" android:strokeColor="#33FFFFFF"/>
+    <path android:fillColor="#00000000" android:pathData="M0,79L108,79"
+          android:strokeWidth="0.8" android:strokeColor="#33FFFFFF"/>
+    <path android:fillColor="#00000000" android:pathData="M0,89L108,89"
+          android:strokeWidth="0.8" android:strokeColor="#33FFFFFF"/>
+    <path android:fillColor="#00000000" android:pathData="M0,99L108,99"
+          android:strokeWidth="0.8" android:strokeColor="#33FFFFFF"/>
+    <path android:fillColor="#00000000" android:pathData="M19,29L89,29"
+          android:strokeWidth="0.8" android:strokeColor="#33FFFFFF"/>
+    <path android:fillColor="#00000000" android:pathData="M19,39L89,39"
+          android:strokeWidth="0.8" android:strokeColor="#33FFFFFF"/>
+    <path android:fillColor="#00000000" android:pathData="M19,49L89,49"
+          android:strokeWidth="0.8" android:strokeColor="#33FFFFFF"/>
+    <path android:fillColor="#00000000" android:pathData="M19,59L89,59"
+          android:strokeWidth="0.8" android:strokeColor="#33FFFFFF"/>
+    <path android:fillColor="#00000000" android:pathData="M19,69L89,69"
+          android:strokeWidth="0.8" android:strokeColor="#33FFFFFF"/>
+    <path android:fillColor="#00000000" android:pathData="M19,79L89,79"
+          android:strokeWidth="0.8" android:strokeColor="#33FFFFFF"/>
+    <path android:fillColor="#00000000" android:pathData="M29,19L29,89"
+          android:strokeWidth="0.8" android:strokeColor="#33FFFFFF"/>
+    <path android:fillColor="#00000000" android:pathData="M39,19L39,89"
+          android:strokeWidth="0.8" android:strokeColor="#33FFFFFF"/>
+    <path android:fillColor="#00000000" android:pathData="M49,19L49,89"
+          android:strokeWidth="0.8" android:strokeColor="#33FFFFFF"/>
+    <path android:fillColor="#00000000" android:pathData="M59,19L59,89"
+          android:strokeWidth="0.8" android:strokeColor="#33FFFFFF"/>
+    <path android:fillColor="#00000000" android:pathData="M69,19L69,89"
+          android:strokeWidth="0.8" android:strokeColor="#33FFFFFF"/>
+    <path android:fillColor="#00000000" android:pathData="M79,19L79,89"
+          android:strokeWidth="0.8" android:strokeColor="#33FFFFFF"/>
+</vector>