Implement support for Android target

build.gradle.kts

@@ -9,6 +9,7 @@ buildscript {
     repositories {
         maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlinx/maven")
         gradlePluginPortal()
+        google()
 
         addDevRepositoryIfEnabled(this, project)
     }
@@ -25,6 +26,7 @@ buildscript {
                 classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
             }
         }
+        classpath("com.android.tools.build:gradle:8.5.1")
     }
 }
 

examples/kotlin-multiplatform/build.gradle

@@ -1,17 +1,55 @@
 import kotlinx.benchmark.gradle.JsBenchmarksExecutor
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     id 'org.jetbrains.kotlin.multiplatform'
     id 'org.jetbrains.kotlin.plugin.allopen' version "2.0.20"
     id 'org.jetbrains.kotlinx.benchmark'
+    id 'com.android.library'
 }
 
 // how to apply plugin to a specific source set?
 allOpen {
     annotation("org.openjdk.jmh.annotations.State")
 }
 
+android {
+    compileSdk 34
+    namespace = "org.jetbrains.kotlinx.examples"
+
+    defaultConfig {
+        minSdk = 29
+        targetSdk = 34
+        versionCode = 1
+        versionName = "1.0"
+
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+    }
+
+    buildTypes {
+        release {
+//            isMinifyEnabled = false
+//            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
+        }
+    }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
+}
+
+// Could not determine the dependencies of task ':examples:kotlin-multiplatform:extractReleaseAnnotations'.
+// > Could not resolve all task dependencies for configuration ':examples:kotlin-multiplatform:detachedConfiguration1'.
+//    > Could not find com.android.tools.lint:lint-gradle:31.2.2.
+repositories {
+    google()
+}
+
 kotlin {
+    androidTarget {
+        // Android target does not have any compilations
+        println("android compilations: ${compilations.size()}")
+    }
     jvm {
         compilations.create('benchmark') { associateWith(compilations.main) }
     }
@@ -47,6 +85,20 @@ kotlin {
         }
 
         nativeMain {}
+
+        androidMain {
+            kotlin.setSrcDirs(["src/androidMain/kotlin"])
+        }
+
+        forEach {
+            // Android target has 3 source sets: androidMain, androidUnitTest, and androidInstrumentedTest
+            println("SourceSet: $it")
+            println(it.name)
+            println(it.kotlin)
+            println(it.kotlin.srcDirs)
+            println(it.kotlin.sourceDirectories)
+        }
+
     }
 }
 
@@ -121,5 +173,17 @@ benchmark {
         register("macosArm64")
         register("linuxX64")
         register("mingwX64")
+        register("android")
     }
 }
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+}
+
+tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
+    compilerOptions {
+        jvmTarget.set(JvmTarget.JVM_1_8)
+    }
+}

examples/kotlin-multiplatform/src/androidMain/kotlin/AndroidTestBenchmark.kt

@@ -0,0 +1,31 @@
+package test
+
+import kotlinx.benchmark.*
+import kotlin.math.*
+
+@State(Scope.Benchmark)
+@Warmup(iterations = 3, time = 1, timeUnit = BenchmarkTimeUnit.SECONDS)
+@Measurement(iterations = 3, time = 1, timeUnit = BenchmarkTimeUnit.SECONDS)
+class AndroidTestBenchmark {
+    private var data = 0.0
+
+    @Setup
+    fun setUp() {
+        data = 3.0
+    }
+
+    @TearDown
+    fun teardown() {
+        // println("Teardown!")
+    }
+
+    @Benchmark
+    fun sqrtBenchmark(): Double {
+        return sqrt(data)
+    }
+
+    @Benchmark
+    fun cosBenchmark(): Double {
+        return cos(data)
+    }
+}

examples/kotlin-multiplatform/src/commonMain/kotlin/CommonBenchmark.kt

@@ -4,6 +4,7 @@ import kotlinx.benchmark.*
 import kotlin.math.*
 
 @State(Scope.Benchmark)
+@Warmup(iterations = 3, time = 1, timeUnit = BenchmarkTimeUnit.SECONDS)
 @Measurement(iterations = 3, time = 1, timeUnit = BenchmarkTimeUnit.SECONDS)
 @OutputTimeUnit(BenchmarkTimeUnit.MILLISECONDS)
 @BenchmarkMode(Mode.AverageTime)

integration/src/main/kotlin/kotlinx/benchmark/integration/GradleTestVersion.kt

@@ -1,6 +1,7 @@
 package kotlinx.benchmark.integration
 
 enum class GradleTestVersion(val versionString: String) {
+    v8_7("8.7"),
     v8_0("8.0.2"),
     MinSupportedGradleVersion("7.4"),
     UnsupportedGradleVersion("7.3"),

integration/src/main/kotlin/kotlinx/benchmark/integration/ProjectBuilder.kt

@@ -51,20 +51,24 @@ private fun generateBuildScript(kotlinVersion: String, jvmToolchain: Int) =
         repositories {
             $kotlin_repo
             $plugin_repo_url
+            google()
             mavenCentral()
         }
         dependencies {
             classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion'
             classpath 'org.jetbrains.kotlinx:kotlinx-benchmark-plugin:0.5.0-SNAPSHOT'
+            classpath 'com.android.tools.build:gradle:8.5.1'
         }
     }
 
     apply plugin: 'kotlin-multiplatform'
     apply plugin: 'org.jetbrains.kotlinx.benchmark'
+    apply plugin: 'com.android.library'
 
     repositories {
         $kotlin_repo
         $runtime_repo_url
+        google()
         mavenCentral()
     }
 

integration/src/main/kotlin/kotlinx/benchmark/integration/Runner.kt

@@ -93,4 +93,10 @@ class Runner(
             projectDir.resolve("build/benchmarks/${targetName}/sources/kotlinx/benchmark/generated").resolve(filePath)
         )
     }
+
+    fun generatedAndroidDir(targetName: String, targetCompilation: String, filePath: String, fileTestAction: (File) -> Unit) {
+        fileTestAction(
+            projectDir.resolve("build/benchmarks/$targetName/$targetCompilation/GeneratedAndroidProject").resolve(filePath)
+        )
+    }
 }

integration/src/test/kotlin/kotlinx/benchmark/integration/AndroidProjectGeneratorTest.kt

@@ -0,0 +1,28 @@
+package kotlinx.benchmark.integration
+
+import org.junit.Test
+import kotlin.test.assertTrue
+
+class AndroidProjectGeneratorTest: GradleTest() {
+    private fun testAndroidProjectGeneration(setupBlock: Runner.() -> Unit, checkBlock: Runner.() -> Unit) {
+        project("source-generation", print = true, gradleVersion = GradleTestVersion.v8_7).apply {
+            setupBlock()
+            runAndSucceed("androidReleaseBenchmarkGenerate")
+            checkBlock()
+        }
+    }
+
+    @Test
+    fun generateAndroidFromResources() {
+        testAndroidProjectGeneration(
+            setupBlock = {
+                runAndSucceed("setupReleaseAndroidProject")
+            },
+            checkBlock = {
+                generatedAndroidDir("android", "release", "") { generatedAndroidDir ->
+                    assertTrue(generatedAndroidDir.exists(), "Generated Android project does not exist")
+                }
+            }
+        )
+    }
+}

integration/src/test/resources/templates/source-generation/build.gradle

@@ -1,10 +1,32 @@
 import org.jetbrains.kotlin.konan.target.KonanTarget
 import org.jetbrains.kotlin.konan.target.HostManager
 
+android {
+    compileSdk 34
+    namespace = "org.jetbrains.kotlinx.tests"
+
+    defaultConfig {
+        minSdk = 29
+        targetSdk = 34
+    }
+
+
+    buildTypes {
+        release {}
+    }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
+}
+
 kotlin {
+    jvmToolchain(8)
+
     jvm { }
     js { nodejs() }
     wasmJs { d8() }
+    androidTarget {}
 
     if (HostManager.hostIsLinux) linuxX64('native')
     if (HostManager.hostIsMingw) mingwX64('native')
@@ -18,5 +40,6 @@ benchmark {
         register("js")
         register("wasmJs")
         register("native")
+        register("android")
     }
 }

plugin/build.gradle.kts

@@ -180,4 +180,4 @@ if (project.findProperty("publication_repository") == "space") {
 
 apiValidation {
     nonPublicMarkers += listOf("kotlinx.benchmark.gradle.internal.KotlinxBenchmarkPluginInternalApi")
-}
+}

plugin/main/resources/GeneratedAndroidProject/app/build.gradle.kts

@@ -0,0 +1,42 @@
+plugins {
+    alias(libs.plugins.android.application)
+    alias(libs.plugins.jetbrains.kotlin.android)
+}
+
+android {
+    namespace = "kotlinx.benchmark.generatedandroidproject"
+    compileSdk = 34
+
+    defaultConfig {
+        applicationId = "kotlinx.benchmark.generatedandroidproject"
+        minSdk = 26
+        targetSdk = 34
+        versionCode = 1
+        versionName = "1.0"
+
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+    }
+
+    buildTypes {
+        release {
+            isMinifyEnabled = false
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro"
+            )
+        }
+    }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+}
+
+dependencies {
+    implementation(libs.androidx.core.ktx)
+    implementation(libs.androidx.appcompat)
+    implementation(libs.material)
+}

plugin/main/resources/GeneratedAndroidProject/app/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.
+#
+# 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

plugin/main/resources/GeneratedAndroidProject/app/src/main/AndroidManifest.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <application
+        android:allowBackup="true"
+        android:dataExtractionRules="@xml/data_extraction_rules"
+        android:fullBackupContent="@xml/backup_rules"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        android:roundIcon="@mipmap/ic_launcher_round"
+        android:supportsRtl="true"
+        android:theme="@style/Theme.GeneratedAndroidProject"
+        tools:targetApi="31" />
+
+</manifest>