Merge pull request #142 from gradle/tt/add-official-agp-preview

Add init spec for AGP app using official AGP preview

Author: tresat

unified-prototype/unified-plugin/plugin-android-init/src/integTest/groovy/org/gradle/api/experimental/android/AndroidApplicationAgpPreview.groovy

@@ -0,0 +1,8 @@
+package org.gradle.api.experimental.android
+
+class AndroidApplicationAgpPreview extends AbstractAndroidBuildInitSpec {
+    @Override
+    protected String getProjectSpecType() {
+        return "android-application-agp-preview"
+    }
+}

unified-prototype/unified-plugin/plugin-android-init/src/main/java/org/gradle/api/experimental/android/AndroidEcosystemInitPlugin.java

@@ -17,7 +17,8 @@ public void apply(Settings settings) {
         getBuildInitSpecRegistry().register(StaticBuildGenerator.class, List.of(
                 new StaticBuildSpec("android-application", "Android application with Android libraries"),
                 new StaticBuildSpec("android-application-basic-activity", "Android Application with a basic Activity"),
-                new StaticBuildSpec("android-application-empty-activity", "Android Application with an empty Activity")
+                new StaticBuildSpec("android-application-empty-activity", "Android Application with an empty Activity"),
+                new StaticBuildSpec("android-application-agp-preview", "Android Application using Official AGP Software Types Preview")
         ));
     }
 

unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-agp-preview/README.md

@@ -0,0 +1,20 @@
+# declarative-samples-android-app
+A sample Android application written in the Declarative Gradle DSL, using the official Android Software Types Preview `androidApplication` and `androidLibrary` defined in the `com.android.ecosystem` ecosystem plugin.
+
+## Building and Running
+
+This sample shows the definition of a multiproject Android application implemented using Kotlin source code.
+
+To build the project without running, use:
+
+```shell
+./gradlew build
+```
+
+To run the application, first install it on a connected Android device using:
+
+```shell
+./gradlew :app:installDebug
+```
+
+In IntelliJ IDEA or Android Studio you can use the `app` run configuration to launch the app in an emulator to see a hello world message.

unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-agp-preview/app/build.gradle.dcl

@@ -0,0 +1,7 @@
+androidApp {
+    namespace = "org.example.app"
+    dependenciesDcl {
+        implementation("org.apache.commons:commons-text:1.11.0")
+        implementation(project(":utilities"))
+    }
+}

unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-agp-preview/app/src/main/AndroidManifest.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <application android:label="@string/app_name">
+        <activity android:name=".MainActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+</manifest>

unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-agp-preview/app/src/main/kotlin/org/example/app/MainActivity.kt

@@ -0,0 +1,28 @@
+package org.example.app
+
+import org.apache.commons.text.WordUtils
+
+import org.example.list.LinkedList
+import org.example.utilities.SplitUtils
+import org.example.utilities.StringUtils
+
+import android.widget.TextView
+import android.os.Bundle
+import android.app.Activity
+
+class MainActivity : Activity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_main)
+
+        val textView = findViewById(R.id.textView) as TextView
+        textView.text = buildMessage()
+    }
+
+    private fun buildMessage(): String {
+        val tokens: LinkedList
+        tokens = SplitUtils.split(MessageUtils.message())
+        val result: String = StringUtils.join(tokens)
+        return WordUtils.capitalize(result)
+    }
+}

unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-agp-preview/app/src/main/kotlin/org/example/app/MessageUtils.kt

@@ -0,0 +1,5 @@
+package org.example.app
+
+internal object MessageUtils {
+    fun message() = "Hello     World!"
+}

unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-agp-preview/app/src/main/res/layout/activity_main.xml

@@ -0,0 +1,12 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                xmlns:tools="http://schemas.android.com/tools"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                tools:context=".MainActivity">
+    <TextView
+            android:id="@+id/textView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerHorizontal="true"
+            android:layout_centerVertical="true" />
+</RelativeLayout>

unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-agp-preview/app/src/main/res/values/strings.xml

@@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name">Sample Declarative Gradle Android App</string>
+</resources>

unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-agp-preview/app/src/test/kotlin/org/example/app/MessageUtilsTest.kt

@@ -0,0 +1,12 @@
+package org.example.app
+
+import org.junit.jupiter.api.Test
+
+import org.junit.jupiter.api.Assertions.assertEquals
+
+class MessageUtilsTest {
+    @Test
+    fun testGetMessage() {
+        assertEquals("Hello      World!", MessageUtils.message())
+    }
+}