diff --git a/unified-prototype/settings.gradle.dcl b/unified-prototype/settings.gradle.kts similarity index 100% rename from unified-prototype/settings.gradle.dcl rename to unified-prototype/settings.gradle.kts diff --git a/unified-prototype/unified-plugin/gradlew b/unified-prototype/unified-plugin/gradlew deleted file mode 100755 index f5feea6d..00000000 --- a/unified-prototype/unified-plugin/gradlew +++ /dev/null @@ -1,252 +0,0 @@ -#!/bin/sh - -# -# Copyright © 2015-2021 the original authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# SPDX-License-Identifier: Apache-2.0 -# - -############################################################################## -# -# Gradle start up script for POSIX generated by Gradle. -# -# Important for running: -# -# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is -# noncompliant, but you have some other compliant shell such as ksh or -# bash, then to run this script, type that shell name before the whole -# command line, like: -# -# ksh Gradle -# -# Busybox and similar reduced shells will NOT work, because this script -# requires all of these POSIX shell features: -# * functions; -# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», -# «${var#prefix}», «${var%suffix}», and «$( cmd )»; -# * compound commands having a testable exit status, especially «case»; -# * various built-in commands including «command», «set», and «ulimit». -# -# Important for patching: -# -# (2) This script targets any POSIX shell, so it avoids extensions provided -# by Bash, Ksh, etc; in particular arrays are avoided. -# -# The "traditional" practice of packing multiple parameters into a -# space-separated string is a well documented source of bugs and security -# problems, so this is (mostly) avoided, by progressively accumulating -# options in "$@", and eventually passing that to Java. -# -# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, -# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; -# see the in-line comments for details. -# -# There are tweaks for specific operating systems such as AIX, CygWin, -# Darwin, MinGW, and NonStop. -# -# (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt -# within the Gradle project. -# -# You can find Gradle at https://github.com/gradle/gradle/. -# -############################################################################## - -# Attempt to set APP_HOME - -# Resolve links: $0 may be a link -app_path=$0 - -# Need this for daisy-chained symlinks. -while - APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path - [ -h "$app_path" ] -do - ls=$( ls -ld "$app_path" ) - link=${ls#*' -> '} - case $link in #( - /*) app_path=$link ;; #( - *) app_path=$APP_HOME$link ;; - esac -done - -# This is normally unused -# shellcheck disable=SC2034 -APP_BASE_NAME=${0##*/} -# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s -' "$PWD" ) || exit - -# Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD=maximum - -warn () { - echo "$*" -} >&2 - -die () { - echo - echo "$*" - echo - exit 1 -} >&2 - -# OS specific support (must be 'true' or 'false'). -cygwin=false -msys=false -darwin=false -nonstop=false -case "$( uname )" in #( - CYGWIN* ) cygwin=true ;; #( - Darwin* ) darwin=true ;; #( - MSYS* | MINGW* ) msys=true ;; #( - NONSTOP* ) nonstop=true ;; -esac - -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar - - -# Determine the Java command to use to start the JVM. -if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD=$JAVA_HOME/jre/sh/java - else - JAVACMD=$JAVA_HOME/bin/java - fi - if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -else - JAVACMD=java - if ! command -v java >/dev/null 2>&1 - then - die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -fi - -# Increase the maximum file descriptors if we can. -if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then - case $MAX_FD in #( - max*) - # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC2039,SC3045 - MAX_FD=$( ulimit -H -n ) || - warn "Could not query maximum file descriptor limit" - esac - case $MAX_FD in #( - '' | soft) :;; #( - *) - # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC2039,SC3045 - ulimit -n "$MAX_FD" || - warn "Could not set maximum file descriptor limit to $MAX_FD" - esac -fi - -# Collect all arguments for the java command, stacking in reverse order: -# * args from the command line -# * the main class name -# * -classpath -# * -D...appname settings -# * --module-path (only if needed) -# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. - -# For Cygwin or MSYS, switch paths to Windows format before running java -if "$cygwin" || "$msys" ; then - APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) - CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) - - JAVACMD=$( cygpath --unix "$JAVACMD" ) - - # Now convert the arguments - kludge to limit ourselves to /bin/sh - for arg do - if - case $arg in #( - -*) false ;; # don't mess with options #( - /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath - [ -e "$t" ] ;; #( - *) false ;; - esac - then - arg=$( cygpath --path --ignore --mixed "$arg" ) - fi - # Roll the args list around exactly as many times as the number of - # args, so each arg winds up back in the position where it started, but - # possibly modified. - # - # NB: a `for` loop captures its iteration list before it begins, so - # changing the positional parameters here affects neither the number of - # iterations, nor the values presented in `arg`. - shift # remove old arg - set -- "$@" "$arg" # push replacement arg - done -fi - - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' - -# Collect all arguments for the java command: -# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, -# and any embedded shellness will be escaped. -# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be -# treated as '${Hostname}' itself on the command line. - -set -- \ - "-Dorg.gradle.appname=$APP_BASE_NAME" \ - -classpath "$CLASSPATH" \ - org.gradle.wrapper.GradleWrapperMain \ - "$@" - -# Stop when "xargs" is not available. -if ! command -v xargs >/dev/null 2>&1 -then - die "xargs is not available" -fi - -# Use "xargs" to parse quoted args. -# -# With -n1 it outputs one arg per line, with the quotes and backslashes removed. -# -# In Bash we could simply go: -# -# readarray ARGS < <( xargs -n1 <<<"$var" ) && -# set -- "${ARGS[@]}" "$@" -# -# but POSIX shell has neither arrays nor command substitution, so instead we -# post-process each arg (as a line of input to sed) to backslash-escape any -# character that might be a shell metacharacter, then use eval to reverse -# that process (while maintaining the separation between arguments), and wrap -# the whole thing up as a single "set" statement. -# -# This will of course break if any of these variables contains a newline or -# an unmatched quote. -# - -eval "set -- $( - printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | - xargs -n1 | - sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | - tr '\n' ' ' - )" '"$@"' - -exec "$JAVACMD" "$@" diff --git a/unified-prototype/unified-plugin/gradlew.bat b/unified-prototype/unified-plugin/gradlew.bat deleted file mode 100644 index 9b42019c..00000000 --- a/unified-prototype/unified-plugin/gradlew.bat +++ /dev/null @@ -1,94 +0,0 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem -@rem SPDX-License-Identifier: Apache-2.0 -@rem - -@if "%DEBUG%"=="" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%"=="" set DIRNAME=. -@rem This is normally unused -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if %ERRORLEVEL% equ 0 goto execute - -echo. 1>&2 -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 -echo. 1>&2 -echo Please set the JAVA_HOME variable in your environment to match the 1>&2 -echo location of your Java installation. 1>&2 - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto execute - -echo. 1>&2 -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 -echo. 1>&2 -echo Please set the JAVA_HOME variable in your environment to match the 1>&2 -echo location of your Java installation. 1>&2 - -goto fail - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* - -:end -@rem End local scope for the variables with windows NT shell -if %ERRORLEVEL% equ 0 goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -set EXIT_CODE=%ERRORLEVEL% -if %EXIT_CODE% equ 0 set EXIT_CODE=1 -if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% -exit /b %EXIT_CODE% - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega diff --git a/unified-prototype/unified-plugin/plugin-android-init/build.gradle.kts b/unified-prototype/unified-plugin/plugin-android-init/build.gradle.kts new file mode 100644 index 00000000..97b4ffa9 --- /dev/null +++ b/unified-prototype/unified-plugin/plugin-android-init/build.gradle.kts @@ -0,0 +1,51 @@ +@file:Suppress("UnstableApiUsage") + +plugins { + `kotlin-dsl` + id("build-logic.publishing") + groovy // For spock testing +} + +description = "Implements the build init for Android" + +dependencies { + api(project(":plugin-common")) +} + +testing { + suites { + @Suppress("UnstableApiUsage") + val integTest by registering(JvmTestSuite::class) { + useSpock("2.2-groovy-3.0") + + dependencies { + implementation(project(":internal-testing-utils")) + } + } + + tasks.getByPath("check").dependsOn(integTest) + } +} + +gradlePlugin { + testSourceSets(project.sourceSets.getByName("integTest")) + + plugins { + create("android-init") { + id = "org.gradle.experimental.android-ecosystem-init" + displayName = "Android Ecosystem Experimental Declarative Plugin" + description = "Experimental declarative plugin for the Android ecosystem" + implementationClass = "org.gradle.api.experimental.android.AndroidEcosystemInitPlugin" + tags = setOf("declarative-gradle", "android", "init") + } + } +} + +// Compile against Java 17 since Android requires Java 17 at minimum +java { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + toolchain { + languageVersion = JavaLanguageVersion.of(17) + } +} diff --git a/unified-prototype/unified-plugin/plugin-android-init/src/main/java/org/gradle/api/experimental/android/AndroidEcosystemInitPlugin.java b/unified-prototype/unified-plugin/plugin-android-init/src/main/java/org/gradle/api/experimental/android/AndroidEcosystemInitPlugin.java new file mode 100644 index 00000000..a57f62d0 --- /dev/null +++ b/unified-prototype/unified-plugin/plugin-android-init/src/main/java/org/gradle/api/experimental/android/AndroidEcosystemInitPlugin.java @@ -0,0 +1,26 @@ +package org.gradle.api.experimental.android; + +import org.gradle.api.Plugin; +import org.gradle.api.experimental.buildinit.StaticProjectGenerator; +import org.gradle.api.experimental.buildinit.StaticProjectSpec; +import org.gradle.api.initialization.Settings; +import org.gradle.buildinit.specs.internal.BuildInitSpecRegistry; + +import javax.inject.Inject; +import java.util.List; + +@SuppressWarnings("UnstableApiUsage") +public abstract class AndroidEcosystemInitPlugin implements Plugin { + @Override + public void apply(Settings settings) { + // TODO: Add something for generating AGP-based templates + getBuildInitSpecRegistry().register(StaticProjectGenerator.class, List.of( + new StaticProjectSpec("android-application", "Declarative Android Application Project"), + new StaticProjectSpec("android-application-basic-activity", "Declarative Android Application Project with Basic Activity"), + new StaticProjectSpec("android-application-empty-activity", "Declarative Android Application Project with Empty Activity") + )); + } + + @Inject + protected abstract BuildInitSpecRegistry getBuildInitSpecRegistry(); +} diff --git a/unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-basic-activity/.gitignore b/unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-basic-activity/.gitignore similarity index 100% rename from unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-basic-activity/.gitignore rename to unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-basic-activity/.gitignore diff --git a/unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-basic-activity/app/.gitignore b/unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-basic-activity/app/.gitignore similarity index 100% rename from unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-basic-activity/app/.gitignore rename to unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-basic-activity/app/.gitignore diff --git a/unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-basic-activity/app/build.gradle.dcl b/unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-basic-activity/app/build.gradle.dcl similarity index 100% rename from unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-basic-activity/app/build.gradle.dcl rename to unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-basic-activity/app/build.gradle.dcl diff --git a/unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-basic-activity/app/proguard-rules.pro b/unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-basic-activity/app/proguard-rules.pro similarity index 100% rename from unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-basic-activity/app/proguard-rules.pro rename to unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-basic-activity/app/proguard-rules.pro diff --git a/unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-basic-activity/app/src/androidTest/java/org/example/app/ExampleInstrumentedTest.kt b/unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-basic-activity/app/src/androidTest/java/org/example/app/ExampleInstrumentedTest.kt similarity index 100% rename from unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-basic-activity/app/src/androidTest/java/org/example/app/ExampleInstrumentedTest.kt rename to unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-basic-activity/app/src/androidTest/java/org/example/app/ExampleInstrumentedTest.kt diff --git a/unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-basic-activity/app/src/main/AndroidManifest.xml b/unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-basic-activity/app/src/main/AndroidManifest.xml similarity index 100% rename from unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-basic-activity/app/src/main/AndroidManifest.xml rename to unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-basic-activity/app/src/main/AndroidManifest.xml diff --git a/unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-basic-activity/app/src/main/java/org/example/app/FirstFragment.kt b/unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-basic-activity/app/src/main/java/org/example/app/FirstFragment.kt similarity index 100% rename from unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-basic-activity/app/src/main/java/org/example/app/FirstFragment.kt rename to unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-basic-activity/app/src/main/java/org/example/app/FirstFragment.kt diff --git a/unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-basic-activity/app/src/main/java/org/example/app/MainActivity.kt b/unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-basic-activity/app/src/main/java/org/example/app/MainActivity.kt similarity index 100% rename from unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-basic-activity/app/src/main/java/org/example/app/MainActivity.kt rename to unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-basic-activity/app/src/main/java/org/example/app/MainActivity.kt diff --git a/unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-basic-activity/app/src/main/java/org/example/app/SecondFragment.kt b/unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-basic-activity/app/src/main/java/org/example/app/SecondFragment.kt similarity index 100% rename from unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-basic-activity/app/src/main/java/org/example/app/SecondFragment.kt rename to unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-basic-activity/app/src/main/java/org/example/app/SecondFragment.kt diff --git a/unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-basic-activity/app/src/main/res/drawable/ic_launcher_background.xml b/unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-basic-activity/app/src/main/res/drawable/ic_launcher_background.xml similarity index 100% rename from unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-basic-activity/app/src/main/res/drawable/ic_launcher_background.xml rename to unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-basic-activity/app/src/main/res/drawable/ic_launcher_background.xml diff --git a/unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-basic-activity/app/src/main/res/drawable/ic_launcher_foreground.xml b/unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-basic-activity/app/src/main/res/drawable/ic_launcher_foreground.xml similarity index 100% rename from unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-basic-activity/app/src/main/res/drawable/ic_launcher_foreground.xml rename to unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-basic-activity/app/src/main/res/drawable/ic_launcher_foreground.xml diff --git a/unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-basic-activity/app/src/main/res/layout/activity_main.xml b/unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-basic-activity/app/src/main/res/layout/activity_main.xml similarity index 100% rename from unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-basic-activity/app/src/main/res/layout/activity_main.xml rename to unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-basic-activity/app/src/main/res/layout/activity_main.xml diff --git a/unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-basic-activity/app/src/main/res/layout/content_main.xml b/unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-basic-activity/app/src/main/res/layout/content_main.xml similarity index 100% rename from unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-basic-activity/app/src/main/res/layout/content_main.xml rename to unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-basic-activity/app/src/main/res/layout/content_main.xml diff --git a/unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-basic-activity/app/src/main/res/layout/fragment_first.xml b/unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-basic-activity/app/src/main/res/layout/fragment_first.xml similarity index 100% rename from unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-basic-activity/app/src/main/res/layout/fragment_first.xml rename to unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-basic-activity/app/src/main/res/layout/fragment_first.xml diff --git a/unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-basic-activity/app/src/main/res/layout/fragment_second.xml b/unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-basic-activity/app/src/main/res/layout/fragment_second.xml similarity index 100% rename from unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-basic-activity/app/src/main/res/layout/fragment_second.xml rename to unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-basic-activity/app/src/main/res/layout/fragment_second.xml diff --git a/unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-basic-activity/app/src/main/res/menu/menu_main.xml b/unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-basic-activity/app/src/main/res/menu/menu_main.xml similarity index 100% rename from unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-basic-activity/app/src/main/res/menu/menu_main.xml rename to unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-basic-activity/app/src/main/res/menu/menu_main.xml diff --git a/unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-basic-activity/app/src/main/res/mipmap-anydpi/ic_launcher.xml b/unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-basic-activity/app/src/main/res/mipmap-anydpi/ic_launcher.xml similarity index 100% rename from unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-basic-activity/app/src/main/res/mipmap-anydpi/ic_launcher.xml rename to unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-basic-activity/app/src/main/res/mipmap-anydpi/ic_launcher.xml diff --git a/unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-basic-activity/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml b/unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-basic-activity/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml similarity index 100% rename from unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-basic-activity/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml rename to unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-basic-activity/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml diff --git a/unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-basic-activity/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-basic-activity/app/src/main/res/mipmap-hdpi/ic_launcher.webp similarity index 100% rename from unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-basic-activity/app/src/main/res/mipmap-hdpi/ic_launcher.webp rename to unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-basic-activity/app/src/main/res/mipmap-hdpi/ic_launcher.webp diff --git a/unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-basic-activity/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-basic-activity/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp similarity index 100% rename from unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-basic-activity/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp rename to unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-basic-activity/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp diff --git a/unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-basic-activity/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-basic-activity/app/src/main/res/mipmap-mdpi/ic_launcher.webp similarity index 100% rename from unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-basic-activity/app/src/main/res/mipmap-mdpi/ic_launcher.webp rename to unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-basic-activity/app/src/main/res/mipmap-mdpi/ic_launcher.webp diff --git a/unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-basic-activity/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-basic-activity/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp similarity index 100% rename from unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-basic-activity/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp rename to unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-basic-activity/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp diff --git a/unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-basic-activity/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-basic-activity/app/src/main/res/mipmap-xhdpi/ic_launcher.webp similarity index 100% rename from unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-basic-activity/app/src/main/res/mipmap-xhdpi/ic_launcher.webp rename to unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-basic-activity/app/src/main/res/mipmap-xhdpi/ic_launcher.webp diff --git a/unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-basic-activity/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-basic-activity/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp similarity index 100% rename from unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-basic-activity/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp rename to unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-basic-activity/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp diff --git a/unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-basic-activity/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-basic-activity/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp similarity index 100% rename from unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-basic-activity/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp rename to unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-basic-activity/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp diff --git a/unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-basic-activity/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-basic-activity/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp similarity index 100% rename from unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-basic-activity/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp rename to unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-basic-activity/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp diff --git a/unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-basic-activity/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-basic-activity/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp similarity index 100% rename from unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-basic-activity/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp rename to unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-basic-activity/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp diff --git a/unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-basic-activity/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-basic-activity/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp similarity index 100% rename from unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-basic-activity/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp rename to unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-basic-activity/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp diff --git a/unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-basic-activity/app/src/main/res/navigation/nav_graph.xml b/unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-basic-activity/app/src/main/res/navigation/nav_graph.xml similarity index 100% rename from unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-basic-activity/app/src/main/res/navigation/nav_graph.xml rename to unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-basic-activity/app/src/main/res/navigation/nav_graph.xml diff --git a/unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-basic-activity/app/src/main/res/values-land/dimens.xml b/unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-basic-activity/app/src/main/res/values-land/dimens.xml similarity index 100% rename from unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-basic-activity/app/src/main/res/values-land/dimens.xml rename to unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-basic-activity/app/src/main/res/values-land/dimens.xml diff --git a/unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-basic-activity/app/src/main/res/values-night/themes.xml b/unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-basic-activity/app/src/main/res/values-night/themes.xml similarity index 100% rename from unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-basic-activity/app/src/main/res/values-night/themes.xml rename to unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-basic-activity/app/src/main/res/values-night/themes.xml diff --git a/unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-basic-activity/app/src/main/res/values-v23/themes.xml b/unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-basic-activity/app/src/main/res/values-v23/themes.xml similarity index 100% rename from unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-basic-activity/app/src/main/res/values-v23/themes.xml rename to unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-basic-activity/app/src/main/res/values-v23/themes.xml diff --git a/unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-basic-activity/app/src/main/res/values-w1240dp/dimens.xml b/unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-basic-activity/app/src/main/res/values-w1240dp/dimens.xml similarity index 100% rename from unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-basic-activity/app/src/main/res/values-w1240dp/dimens.xml rename to unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-basic-activity/app/src/main/res/values-w1240dp/dimens.xml diff --git a/unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-basic-activity/app/src/main/res/values-w600dp/dimens.xml b/unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-basic-activity/app/src/main/res/values-w600dp/dimens.xml similarity index 100% rename from unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-basic-activity/app/src/main/res/values-w600dp/dimens.xml rename to unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-basic-activity/app/src/main/res/values-w600dp/dimens.xml diff --git a/unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-basic-activity/app/src/main/res/values/colors.xml b/unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-basic-activity/app/src/main/res/values/colors.xml similarity index 100% rename from unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-basic-activity/app/src/main/res/values/colors.xml rename to unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-basic-activity/app/src/main/res/values/colors.xml diff --git a/unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-basic-activity/app/src/main/res/values/dimens.xml b/unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-basic-activity/app/src/main/res/values/dimens.xml similarity index 100% rename from unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-basic-activity/app/src/main/res/values/dimens.xml rename to unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-basic-activity/app/src/main/res/values/dimens.xml diff --git a/unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-basic-activity/app/src/main/res/values/strings.xml b/unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-basic-activity/app/src/main/res/values/strings.xml similarity index 100% rename from unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-basic-activity/app/src/main/res/values/strings.xml rename to unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-basic-activity/app/src/main/res/values/strings.xml diff --git a/unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-basic-activity/app/src/main/res/values/themes.xml b/unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-basic-activity/app/src/main/res/values/themes.xml similarity index 100% rename from unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-basic-activity/app/src/main/res/values/themes.xml rename to unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-basic-activity/app/src/main/res/values/themes.xml diff --git a/unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-basic-activity/app/src/main/res/xml/backup_rules.xml b/unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-basic-activity/app/src/main/res/xml/backup_rules.xml similarity index 100% rename from unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-basic-activity/app/src/main/res/xml/backup_rules.xml rename to unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-basic-activity/app/src/main/res/xml/backup_rules.xml diff --git a/unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-basic-activity/app/src/main/res/xml/data_extraction_rules.xml b/unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-basic-activity/app/src/main/res/xml/data_extraction_rules.xml similarity index 100% rename from unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-basic-activity/app/src/main/res/xml/data_extraction_rules.xml rename to unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-basic-activity/app/src/main/res/xml/data_extraction_rules.xml diff --git a/unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-basic-activity/app/src/test/java/org/example/app/ExampleUnitTest.kt b/unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-basic-activity/app/src/test/java/org/example/app/ExampleUnitTest.kt similarity index 100% rename from unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-basic-activity/app/src/test/java/org/example/app/ExampleUnitTest.kt rename to unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-basic-activity/app/src/test/java/org/example/app/ExampleUnitTest.kt diff --git a/unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-basic-activity/gradle.properties b/unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-basic-activity/gradle.properties similarity index 100% rename from unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-basic-activity/gradle.properties rename to unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-basic-activity/gradle.properties diff --git a/unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-basic-activity/settings.gradle.dcl b/unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-basic-activity/settings.gradle.dcl similarity index 100% rename from unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-basic-activity/settings.gradle.dcl rename to unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-basic-activity/settings.gradle.dcl diff --git a/unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-empty-activity/.gitignore b/unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-empty-activity/.gitignore similarity index 100% rename from unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-empty-activity/.gitignore rename to unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-empty-activity/.gitignore diff --git a/unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-empty-activity/app/.gitignore b/unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-empty-activity/app/.gitignore similarity index 100% rename from unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-empty-activity/app/.gitignore rename to unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-empty-activity/app/.gitignore diff --git a/unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-empty-activity/app/build.gradle.dcl b/unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-empty-activity/app/build.gradle.dcl similarity index 100% rename from unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-empty-activity/app/build.gradle.dcl rename to unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-empty-activity/app/build.gradle.dcl diff --git a/unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-empty-activity/app/proguard-rules.pro b/unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-empty-activity/app/proguard-rules.pro similarity index 100% rename from unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-empty-activity/app/proguard-rules.pro rename to unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-empty-activity/app/proguard-rules.pro diff --git a/unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-empty-activity/app/src/androidTest/java/org/example/app/ExampleInstrumentedTest.kt b/unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-empty-activity/app/src/androidTest/java/org/example/app/ExampleInstrumentedTest.kt similarity index 100% rename from unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-empty-activity/app/src/androidTest/java/org/example/app/ExampleInstrumentedTest.kt rename to unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-empty-activity/app/src/androidTest/java/org/example/app/ExampleInstrumentedTest.kt diff --git a/unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-empty-activity/app/src/main/AndroidManifest.xml b/unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-empty-activity/app/src/main/AndroidManifest.xml similarity index 100% rename from unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-empty-activity/app/src/main/AndroidManifest.xml rename to unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-empty-activity/app/src/main/AndroidManifest.xml diff --git a/unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-empty-activity/app/src/main/java/org/example/app/MainActivity.kt b/unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-empty-activity/app/src/main/java/org/example/app/MainActivity.kt similarity index 100% rename from unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-empty-activity/app/src/main/java/org/example/app/MainActivity.kt rename to unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-empty-activity/app/src/main/java/org/example/app/MainActivity.kt diff --git a/unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-empty-activity/app/src/main/java/org/example/app/ui/theme/Color.kt b/unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-empty-activity/app/src/main/java/org/example/app/ui/theme/Color.kt similarity index 100% rename from unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-empty-activity/app/src/main/java/org/example/app/ui/theme/Color.kt rename to unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-empty-activity/app/src/main/java/org/example/app/ui/theme/Color.kt diff --git a/unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-empty-activity/app/src/main/java/org/example/app/ui/theme/Theme.kt b/unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-empty-activity/app/src/main/java/org/example/app/ui/theme/Theme.kt similarity index 100% rename from unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-empty-activity/app/src/main/java/org/example/app/ui/theme/Theme.kt rename to unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-empty-activity/app/src/main/java/org/example/app/ui/theme/Theme.kt diff --git a/unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-empty-activity/app/src/main/java/org/example/app/ui/theme/Type.kt b/unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-empty-activity/app/src/main/java/org/example/app/ui/theme/Type.kt similarity index 100% rename from unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-empty-activity/app/src/main/java/org/example/app/ui/theme/Type.kt rename to unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-empty-activity/app/src/main/java/org/example/app/ui/theme/Type.kt diff --git a/unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-empty-activity/app/src/main/res/drawable/ic_launcher_background.xml b/unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-empty-activity/app/src/main/res/drawable/ic_launcher_background.xml similarity index 100% rename from unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-empty-activity/app/src/main/res/drawable/ic_launcher_background.xml rename to unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-empty-activity/app/src/main/res/drawable/ic_launcher_background.xml diff --git a/unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-empty-activity/app/src/main/res/drawable/ic_launcher_foreground.xml b/unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-empty-activity/app/src/main/res/drawable/ic_launcher_foreground.xml similarity index 100% rename from unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-empty-activity/app/src/main/res/drawable/ic_launcher_foreground.xml rename to unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-empty-activity/app/src/main/res/drawable/ic_launcher_foreground.xml diff --git a/unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-empty-activity/app/src/main/res/mipmap-anydpi/ic_launcher.xml b/unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-empty-activity/app/src/main/res/mipmap-anydpi/ic_launcher.xml similarity index 100% rename from unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-empty-activity/app/src/main/res/mipmap-anydpi/ic_launcher.xml rename to unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-empty-activity/app/src/main/res/mipmap-anydpi/ic_launcher.xml diff --git a/unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-empty-activity/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml b/unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-empty-activity/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml similarity index 100% rename from unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-empty-activity/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml rename to unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-empty-activity/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml diff --git a/unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-empty-activity/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-empty-activity/app/src/main/res/mipmap-hdpi/ic_launcher.webp similarity index 100% rename from unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-empty-activity/app/src/main/res/mipmap-hdpi/ic_launcher.webp rename to unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-empty-activity/app/src/main/res/mipmap-hdpi/ic_launcher.webp diff --git a/unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-empty-activity/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-empty-activity/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp similarity index 100% rename from unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-empty-activity/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp rename to unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-empty-activity/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp diff --git a/unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-empty-activity/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-empty-activity/app/src/main/res/mipmap-mdpi/ic_launcher.webp similarity index 100% rename from unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-empty-activity/app/src/main/res/mipmap-mdpi/ic_launcher.webp rename to unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-empty-activity/app/src/main/res/mipmap-mdpi/ic_launcher.webp diff --git a/unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-empty-activity/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-empty-activity/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp similarity index 100% rename from unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-empty-activity/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp rename to unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-empty-activity/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp diff --git a/unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-empty-activity/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-empty-activity/app/src/main/res/mipmap-xhdpi/ic_launcher.webp similarity index 100% rename from unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-empty-activity/app/src/main/res/mipmap-xhdpi/ic_launcher.webp rename to unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-empty-activity/app/src/main/res/mipmap-xhdpi/ic_launcher.webp diff --git a/unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-empty-activity/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-empty-activity/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp similarity index 100% rename from unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-empty-activity/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp rename to unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-empty-activity/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp diff --git a/unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-empty-activity/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-empty-activity/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp similarity index 100% rename from unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-empty-activity/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp rename to unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-empty-activity/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp diff --git a/unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-empty-activity/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-empty-activity/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp similarity index 100% rename from unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-empty-activity/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp rename to unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-empty-activity/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp diff --git a/unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-empty-activity/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-empty-activity/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp similarity index 100% rename from unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-empty-activity/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp rename to unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-empty-activity/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp diff --git a/unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-empty-activity/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-empty-activity/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp similarity index 100% rename from unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-empty-activity/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp rename to unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-empty-activity/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp diff --git a/unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-empty-activity/app/src/main/res/values/colors.xml b/unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-empty-activity/app/src/main/res/values/colors.xml similarity index 100% rename from unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-empty-activity/app/src/main/res/values/colors.xml rename to unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-empty-activity/app/src/main/res/values/colors.xml diff --git a/unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-empty-activity/app/src/main/res/values/strings.xml b/unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-empty-activity/app/src/main/res/values/strings.xml similarity index 100% rename from unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-empty-activity/app/src/main/res/values/strings.xml rename to unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-empty-activity/app/src/main/res/values/strings.xml diff --git a/unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-empty-activity/app/src/main/res/values/themes.xml b/unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-empty-activity/app/src/main/res/values/themes.xml similarity index 100% rename from unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-empty-activity/app/src/main/res/values/themes.xml rename to unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-empty-activity/app/src/main/res/values/themes.xml diff --git a/unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-empty-activity/app/src/main/res/xml/backup_rules.xml b/unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-empty-activity/app/src/main/res/xml/backup_rules.xml similarity index 100% rename from unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-empty-activity/app/src/main/res/xml/backup_rules.xml rename to unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-empty-activity/app/src/main/res/xml/backup_rules.xml diff --git a/unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-empty-activity/app/src/main/res/xml/data_extraction_rules.xml b/unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-empty-activity/app/src/main/res/xml/data_extraction_rules.xml similarity index 100% rename from unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-empty-activity/app/src/main/res/xml/data_extraction_rules.xml rename to unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-empty-activity/app/src/main/res/xml/data_extraction_rules.xml diff --git a/unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-empty-activity/app/src/test/java/org/example/app/ExampleUnitTest.kt b/unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-empty-activity/app/src/test/java/org/example/app/ExampleUnitTest.kt similarity index 100% rename from unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-empty-activity/app/src/test/java/org/example/app/ExampleUnitTest.kt rename to unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-empty-activity/app/src/test/java/org/example/app/ExampleUnitTest.kt diff --git a/unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-empty-activity/gradle.properties b/unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-empty-activity/gradle.properties similarity index 100% rename from unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-empty-activity/gradle.properties rename to unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-empty-activity/gradle.properties diff --git a/unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-empty-activity/settings.gradle.dcl b/unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-empty-activity/settings.gradle.dcl similarity index 100% rename from unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application-empty-activity/settings.gradle.dcl rename to unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application-empty-activity/settings.gradle.dcl diff --git a/unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application/README.md b/unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application/README.md similarity index 100% rename from unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application/README.md rename to unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application/README.md diff --git a/unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application/app/build.gradle.dcl b/unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application/app/build.gradle.dcl similarity index 100% rename from unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application/app/build.gradle.dcl rename to unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application/app/build.gradle.dcl diff --git a/unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application/app/src/main/AndroidManifest.xml b/unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application/app/src/main/AndroidManifest.xml similarity index 100% rename from unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application/app/src/main/AndroidManifest.xml rename to unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application/app/src/main/AndroidManifest.xml diff --git a/unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application/app/src/main/kotlin/org/example/app/MainActivity.kt b/unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application/app/src/main/kotlin/org/example/app/MainActivity.kt similarity index 100% rename from unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application/app/src/main/kotlin/org/example/app/MainActivity.kt rename to unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application/app/src/main/kotlin/org/example/app/MainActivity.kt diff --git a/unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application/app/src/main/kotlin/org/example/app/MessageUtils.kt b/unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application/app/src/main/kotlin/org/example/app/MessageUtils.kt similarity index 100% rename from unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application/app/src/main/kotlin/org/example/app/MessageUtils.kt rename to unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application/app/src/main/kotlin/org/example/app/MessageUtils.kt diff --git a/unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application/app/src/main/res/layout/activity_main.xml b/unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application/app/src/main/res/layout/activity_main.xml similarity index 100% rename from unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application/app/src/main/res/layout/activity_main.xml rename to unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application/app/src/main/res/layout/activity_main.xml diff --git a/unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application/app/src/main/res/values/strings.xml b/unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application/app/src/main/res/values/strings.xml similarity index 100% rename from unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application/app/src/main/res/values/strings.xml rename to unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application/app/src/main/res/values/strings.xml diff --git a/unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application/app/src/test/kotlin/org/example/app/MessageUtilsTest.kt b/unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application/app/src/test/kotlin/org/example/app/MessageUtilsTest.kt similarity index 100% rename from unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application/app/src/test/kotlin/org/example/app/MessageUtilsTest.kt rename to unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application/app/src/test/kotlin/org/example/app/MessageUtilsTest.kt diff --git a/unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application/gradle.properties b/unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application/gradle.properties similarity index 100% rename from unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application/gradle.properties rename to unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application/gradle.properties diff --git a/unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application/list/build.gradle.dcl b/unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application/list/build.gradle.dcl similarity index 100% rename from unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application/list/build.gradle.dcl rename to unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application/list/build.gradle.dcl diff --git a/unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application/list/src/main/kotlin/org/example/list/LinkedList.kt b/unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application/list/src/main/kotlin/org/example/list/LinkedList.kt similarity index 100% rename from unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application/list/src/main/kotlin/org/example/list/LinkedList.kt rename to unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application/list/src/main/kotlin/org/example/list/LinkedList.kt diff --git a/unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application/settings.gradle.dcl b/unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application/settings.gradle.dcl similarity index 100% rename from unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application/settings.gradle.dcl rename to unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application/settings.gradle.dcl diff --git a/unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application/utilities/build.gradle.dcl b/unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application/utilities/build.gradle.dcl similarity index 100% rename from unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application/utilities/build.gradle.dcl rename to unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application/utilities/build.gradle.dcl diff --git a/unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application/utilities/src/main/kotlin/org/example/utilities/JoinUtils.kt b/unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application/utilities/src/main/kotlin/org/example/utilities/JoinUtils.kt similarity index 100% rename from unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application/utilities/src/main/kotlin/org/example/utilities/JoinUtils.kt rename to unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application/utilities/src/main/kotlin/org/example/utilities/JoinUtils.kt diff --git a/unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application/utilities/src/main/kotlin/org/example/utilities/SplitUtils.kt b/unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application/utilities/src/main/kotlin/org/example/utilities/SplitUtils.kt similarity index 100% rename from unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application/utilities/src/main/kotlin/org/example/utilities/SplitUtils.kt rename to unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application/utilities/src/main/kotlin/org/example/utilities/SplitUtils.kt diff --git a/unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application/utilities/src/main/kotlin/org/example/utilities/StringUtils.kt b/unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application/utilities/src/main/kotlin/org/example/utilities/StringUtils.kt similarity index 100% rename from unified-prototype/unified-plugin/plugin-android/src/main/resources/templates/android-application/utilities/src/main/kotlin/org/example/utilities/StringUtils.kt rename to unified-prototype/unified-plugin/plugin-android-init/src/main/resources/templates/android-application/utilities/src/main/kotlin/org/example/utilities/StringUtils.kt diff --git a/unified-prototype/unified-plugin/plugin-android/build.gradle.kts b/unified-prototype/unified-plugin/plugin-android/build.gradle.kts index 257c9ad6..80cb8d00 100644 --- a/unified-prototype/unified-plugin/plugin-android/build.gradle.kts +++ b/unified-prototype/unified-plugin/plugin-android/build.gradle.kts @@ -14,6 +14,7 @@ dependencies { api(libs.android.kotlin.android) implementation(project(":plugin-jvm")) + implementation(project(":plugin-android-init")) implementation(libs.baseline.profile.plugin) implementation(libs.dependency.guard.plugin) implementation(libs.ksp.plugin) diff --git a/unified-prototype/unified-plugin/plugin-android/src/main/java/org/gradle/api/experimental/android/AndroidEcosystemPlugin.java b/unified-prototype/unified-plugin/plugin-android/src/main/java/org/gradle/api/experimental/android/AndroidEcosystemPlugin.java index d014ff63..e84343de 100644 --- a/unified-prototype/unified-plugin/plugin-android/src/main/java/org/gradle/api/experimental/android/AndroidEcosystemPlugin.java +++ b/unified-prototype/unified-plugin/plugin-android/src/main/java/org/gradle/api/experimental/android/AndroidEcosystemPlugin.java @@ -3,31 +3,26 @@ import org.gradle.api.Plugin; import org.gradle.api.experimental.android.application.StandaloneAndroidApplicationPlugin; import org.gradle.api.experimental.android.library.StandaloneAndroidLibraryPlugin; -import org.gradle.api.experimental.buildinit.AbstractSpecContributingPlugin; +import org.gradle.api.experimental.buildinit.StaticProjectGenerator; import org.gradle.api.experimental.buildinit.StaticProjectSpec; import org.gradle.api.experimental.jvm.JvmEcosystemConventionsPlugin; import org.gradle.api.initialization.Settings; import org.gradle.api.internal.plugins.software.RegistersSoftwareTypes; -import org.gradle.buildinit.specs.BuildInitSpec; +import org.gradle.buildinit.specs.internal.BuildInitSpecRegistry; +import javax.inject.Inject; import java.util.List; @SuppressWarnings("UnstableApiUsage") @RegistersSoftwareTypes({StandaloneAndroidApplicationPlugin.class, StandaloneAndroidLibraryPlugin.class}) -public abstract class AndroidEcosystemPlugin extends AbstractSpecContributingPlugin implements Plugin { +public abstract class AndroidEcosystemPlugin implements Plugin { @Override public void apply(Settings target) { - registerSpecs(); + target.getPlugins().apply("org.gradle.experimental.android-ecosystem-init"); target.getPlugins().apply(JvmEcosystemConventionsPlugin.class); target.getDependencyResolutionManagement().getRepositories().google(); } - @Override - protected List getSpecs() { - return List.of( - new StaticProjectSpec("android-application", "Declarative Android Application Project"), - new StaticProjectSpec("android-application-basic-activity", "Declarative Android Application Project with Basic Activity"), - new StaticProjectSpec("android-application-empty-activity", "Declarative Android Application Project with Empty Activity") - ); - } + @Inject + protected abstract BuildInitSpecRegistry getBuildInitSpecRegistry(); } diff --git a/unified-prototype/unified-plugin/plugin-android/src/main/java/org/gradle/api/experimental/android/application/StandaloneAndroidApplicationPlugin.java b/unified-prototype/unified-plugin/plugin-android/src/main/java/org/gradle/api/experimental/android/application/StandaloneAndroidApplicationPlugin.java index 4cc6d8a5..41b562d0 100644 --- a/unified-prototype/unified-plugin/plugin-android/src/main/java/org/gradle/api/experimental/android/application/StandaloneAndroidApplicationPlugin.java +++ b/unified-prototype/unified-plugin/plugin-android/src/main/java/org/gradle/api/experimental/android/application/StandaloneAndroidApplicationPlugin.java @@ -4,6 +4,7 @@ import org.gradle.api.Project; import org.gradle.api.experimental.android.AbstractAndroidSoftwarePlugin; import org.gradle.api.experimental.android.AndroidSoftware; +import org.gradle.api.experimental.android.extensions.linting.LintSupport; import org.gradle.api.experimental.android.nia.NiaSupport; import org.gradle.api.internal.plugins.software.SoftwareType; @@ -70,6 +71,7 @@ private void linkDslModelToPlugin(Project project, AndroidApplication dslModel) ifPresent(dslModel.getApplicationId(), defaultConfig::setApplicationId); return null; }); + LintSupport.configureLint(project, dslModel); android.getBuildFeatures().setViewBinding(dslModel.getViewBinding().getEnabled().get()); android.getBuildFeatures().setDataBinding(dslModel.getDataBinding().getEnabled().get()); diff --git a/unified-prototype/unified-plugin/plugin-common/src/main/java/org/gradle/api/experimental/common/extensions/LintSupport.java b/unified-prototype/unified-plugin/plugin-android/src/main/java/org/gradle/api/experimental/android/extensions/linting/LintSupport.java similarity index 94% rename from unified-prototype/unified-plugin/plugin-common/src/main/java/org/gradle/api/experimental/common/extensions/LintSupport.java rename to unified-prototype/unified-plugin/plugin-android/src/main/java/org/gradle/api/experimental/android/extensions/linting/LintSupport.java index 9abc844f..92c13861 100644 --- a/unified-prototype/unified-plugin/plugin-common/src/main/java/org/gradle/api/experimental/common/extensions/LintSupport.java +++ b/unified-prototype/unified-plugin/plugin-android/src/main/java/org/gradle/api/experimental/android/extensions/linting/LintSupport.java @@ -14,12 +14,13 @@ * limitations under the License. */ -package org.gradle.api.experimental.common.extensions; +package org.gradle.api.experimental.android.extensions.linting; import com.android.build.api.dsl.ApplicationExtension; import com.android.build.api.dsl.LibraryExtension; import org.gradle.api.Project; import com.android.build.api.dsl.Lint; +import org.gradle.api.experimental.common.extensions.HasLinting; public final class LintSupport { private LintSupport() { /* not instantiable */ } diff --git a/unified-prototype/unified-plugin/plugin-android/src/main/java/org/gradle/api/experimental/android/library/StandaloneAndroidLibraryPlugin.java b/unified-prototype/unified-plugin/plugin-android/src/main/java/org/gradle/api/experimental/android/library/StandaloneAndroidLibraryPlugin.java index 0b2d99c4..d35b5d57 100644 --- a/unified-prototype/unified-plugin/plugin-android/src/main/java/org/gradle/api/experimental/android/library/StandaloneAndroidLibraryPlugin.java +++ b/unified-prototype/unified-plugin/plugin-android/src/main/java/org/gradle/api/experimental/android/library/StandaloneAndroidLibraryPlugin.java @@ -9,6 +9,7 @@ import org.gradle.api.artifacts.Dependency; import org.gradle.api.experimental.android.AbstractAndroidSoftwarePlugin; import org.gradle.api.experimental.android.AndroidSoftware; +import org.gradle.api.experimental.android.extensions.linting.LintSupport; import org.gradle.api.experimental.android.nia.NiaSupport; import org.gradle.api.internal.plugins.software.SoftwareType; import org.jetbrains.kotlin.com.google.common.base.Preconditions; @@ -71,7 +72,7 @@ private void linkDslModelToPlugin(Project project, AndroidLibrary dslModel) { if (NiaSupport.isNiaProject(project)) { NiaSupport.configureNiaLibrary(project, dslModel); } - + LintSupport.configureLint(project, dslModel); ifPresent(dslModel.getConsumerProguardFile(), android.getDefaultConfig()::consumerProguardFile); ifPresent(dslModel.getBuildConfig(), android.getBuildFeatures()::setBuildConfig); } diff --git a/unified-prototype/unified-plugin/plugin-common/build.gradle.kts b/unified-prototype/unified-plugin/plugin-common/build.gradle.kts index 6c1c3177..99610813 100644 --- a/unified-prototype/unified-plugin/plugin-common/build.gradle.kts +++ b/unified-prototype/unified-plugin/plugin-common/build.gradle.kts @@ -10,8 +10,6 @@ plugins { description = "Common APIs and implementation classes shared by the ecosystem specific declarative prototypes" dependencies { - implementation(libs.android.agp.application) - implementation("commons-io:commons-io:2.15.1") implementation(gradleApi()) } diff --git a/unified-prototype/unified-plugin/plugin-common/src/main/java/org/gradle/api/experimental/buildinit/AbstractSpecContributingPlugin.java b/unified-prototype/unified-plugin/plugin-common/src/main/java/org/gradle/api/experimental/buildinit/AbstractSpecContributingPlugin.java deleted file mode 100644 index 54527be1..00000000 --- a/unified-prototype/unified-plugin/plugin-common/src/main/java/org/gradle/api/experimental/buildinit/AbstractSpecContributingPlugin.java +++ /dev/null @@ -1,24 +0,0 @@ -package org.gradle.api.experimental.buildinit; - -import org.gradle.buildinit.specs.BuildInitSpec; -import org.gradle.buildinit.specs.BuildInitGenerator; -import org.gradle.buildinit.specs.internal.BuildInitSpecRegistry; - -import javax.inject.Inject; -import java.util.List; - -@SuppressWarnings("UnstableApiUsage") -public abstract class AbstractSpecContributingPlugin { - protected abstract List getSpecs(); - - protected Class getGenerator() { - return StaticProjectGenerator.class; - } - - protected void registerSpecs() { - getBuildInitSpecRegistry().register(getGenerator(), getSpecs()); - } - - @Inject - protected abstract BuildInitSpecRegistry getBuildInitSpecRegistry(); -} diff --git a/unified-prototype/unified-plugin/plugin-jvm/src/main/java/org/gradle/api/experimental/jvm/JvmEcosystemPlugin.java b/unified-prototype/unified-plugin/plugin-jvm/src/main/java/org/gradle/api/experimental/jvm/JvmEcosystemPlugin.java index 8a3fddc2..b1fd3e10 100644 --- a/unified-prototype/unified-plugin/plugin-jvm/src/main/java/org/gradle/api/experimental/jvm/JvmEcosystemPlugin.java +++ b/unified-prototype/unified-plugin/plugin-jvm/src/main/java/org/gradle/api/experimental/jvm/JvmEcosystemPlugin.java @@ -1,14 +1,15 @@ package org.gradle.api.experimental.jvm; import org.gradle.api.Plugin; -import org.gradle.api.experimental.buildinit.AbstractSpecContributingPlugin; +import org.gradle.api.experimental.buildinit.StaticProjectGenerator; import org.gradle.api.experimental.buildinit.StaticProjectSpec; import org.gradle.api.experimental.java.StandaloneJavaApplicationPlugin; import org.gradle.api.experimental.java.StandaloneJavaLibraryPlugin; import org.gradle.api.initialization.Settings; import org.gradle.api.internal.plugins.software.RegistersSoftwareTypes; -import org.gradle.buildinit.specs.BuildInitSpec; +import org.gradle.buildinit.specs.internal.BuildInitSpecRegistry; +import javax.inject.Inject; import java.util.List; @SuppressWarnings("UnstableApiUsage") @@ -18,17 +19,15 @@ StandaloneJvmLibraryPlugin.class, StandaloneJvmApplicationPlugin.class }) -public abstract class JvmEcosystemPlugin extends AbstractSpecContributingPlugin implements Plugin { +public abstract class JvmEcosystemPlugin implements Plugin { @Override public void apply(Settings target) { - registerSpecs(); + getBuildInitSpecRegistry().register(StaticProjectGenerator.class, List.of( + new StaticProjectSpec("java-application", "Declarative Java Application Project") + )); target.getPlugins().apply(JvmEcosystemConventionsPlugin.class); } - @Override - protected List getSpecs() { - return List.of( - new StaticProjectSpec("java-application", "Declarative Java Application Project") - ); - } + @Inject + protected abstract BuildInitSpecRegistry getBuildInitSpecRegistry(); } diff --git a/unified-prototype/unified-plugin/plugin-kmp/src/main/java/org/gradle/api/experimental/kmp/KmpEcosystemPlugin.java b/unified-prototype/unified-plugin/plugin-kmp/src/main/java/org/gradle/api/experimental/kmp/KmpEcosystemPlugin.java index d7fb29bf..80be4ac8 100644 --- a/unified-prototype/unified-plugin/plugin-kmp/src/main/java/org/gradle/api/experimental/kmp/KmpEcosystemPlugin.java +++ b/unified-prototype/unified-plugin/plugin-kmp/src/main/java/org/gradle/api/experimental/kmp/KmpEcosystemPlugin.java @@ -1,15 +1,16 @@ package org.gradle.api.experimental.kmp; import org.gradle.api.Plugin; -import org.gradle.api.experimental.buildinit.AbstractSpecContributingPlugin; +import org.gradle.api.experimental.buildinit.StaticProjectGenerator; import org.gradle.api.experimental.buildinit.StaticProjectSpec; import org.gradle.api.experimental.jvm.JvmEcosystemConventionsPlugin; import org.gradle.api.experimental.kotlin.StandaloneKotlinJvmApplicationPlugin; import org.gradle.api.experimental.kotlin.StandaloneKotlinJvmLibraryPlugin; import org.gradle.api.initialization.Settings; import org.gradle.api.internal.plugins.software.RegistersSoftwareTypes; -import org.gradle.buildinit.specs.BuildInitSpec; +import org.gradle.buildinit.specs.internal.BuildInitSpecRegistry; +import javax.inject.Inject; import java.util.List; @@ -19,17 +20,15 @@ StandaloneKmpApplicationPlugin.class, StandaloneKotlinJvmLibraryPlugin.class, StandaloneKotlinJvmApplicationPlugin.class}) -public abstract class KmpEcosystemPlugin extends AbstractSpecContributingPlugin implements Plugin { +public abstract class KmpEcosystemPlugin implements Plugin { @Override public void apply(Settings target) { - registerSpecs(); + getBuildInitSpecRegistry().register(StaticProjectGenerator.class, List.of( + new StaticProjectSpec("kotlin-application", "Declarative Kotlin (JVM) Application Project") + )); target.getPlugins().apply(JvmEcosystemConventionsPlugin.class); } - @Override - protected List getSpecs() { - return List.of( - new StaticProjectSpec("kotlin-application", "Declarative Kotlin (JVM) Application Project") - ); - } + @Inject + protected abstract BuildInitSpecRegistry getBuildInitSpecRegistry(); } diff --git a/unified-prototype/unified-plugin/plugin-kmp/src/main/java/org/gradle/api/experimental/kotlin/KotlinJvmLibrary.java b/unified-prototype/unified-plugin/plugin-kmp/src/main/java/org/gradle/api/experimental/kotlin/KotlinJvmLibrary.java index a5d15e8b..ef8daec1 100644 --- a/unified-prototype/unified-plugin/plugin-kmp/src/main/java/org/gradle/api/experimental/kotlin/KotlinJvmLibrary.java +++ b/unified-prototype/unified-plugin/plugin-kmp/src/main/java/org/gradle/api/experimental/kotlin/KotlinJvmLibrary.java @@ -14,16 +14,7 @@ * A library implemented using Kotlin and that targets a single JVM version. */ @Restricted -public interface KotlinJvmLibrary extends HasJavaTarget, HasLibraryDependencies, HasLinting { - @Override - @Nested - Lint getLint(); - - @Configuring - default void lint(Action action) { - action.execute(getLint()); - } - +public interface KotlinJvmLibrary extends HasJavaTarget, HasLibraryDependencies { @Nested Testing getTesting(); diff --git a/unified-prototype/unified-plugin/plugin-kmp/src/main/java/org/gradle/api/experimental/kotlin/StandaloneKotlinJvmLibraryPlugin.java b/unified-prototype/unified-plugin/plugin-kmp/src/main/java/org/gradle/api/experimental/kotlin/StandaloneKotlinJvmLibraryPlugin.java index 3c43a3b3..b1305d95 100644 --- a/unified-prototype/unified-plugin/plugin-kmp/src/main/java/org/gradle/api/experimental/kotlin/StandaloneKotlinJvmLibraryPlugin.java +++ b/unified-prototype/unified-plugin/plugin-kmp/src/main/java/org/gradle/api/experimental/kotlin/StandaloneKotlinJvmLibraryPlugin.java @@ -3,7 +3,6 @@ import org.gradle.api.Plugin; import org.gradle.api.Project; import org.gradle.api.artifacts.ConfigurationContainer; -import org.gradle.api.experimental.common.extensions.LintSupport; import org.gradle.api.experimental.jvm.internal.JvmPluginSupport; import org.gradle.api.experimental.kmp.internal.KotlinPluginSupport; import org.gradle.api.internal.plugins.software.SoftwareType; @@ -26,11 +25,6 @@ public void apply(Project project) { project.getPlugins().apply("org.jetbrains.kotlin.jvm"); - // Setup Linting conventions - dslModel.getLint().getEnabled().convention(false); - dslModel.getLint().getXmlReport().convention(false); - dslModel.getLint().getCheckDependencies().convention(false); - linkDslModelToPlugin(project, dslModel); } @@ -38,7 +32,6 @@ private void linkDslModelToPlugin(Project project, KotlinJvmLibrary dslModel) { KotlinPluginSupport.linkJavaVersion(project, dslModel); JvmPluginSupport.linkMainSourceSourceSetDependencies(project, dslModel.getDependencies()); - LintSupport.configureLint(project, dslModel); configureTesting(project, dslModel); } diff --git a/unified-prototype/unified-plugin/settings.gradle.kts b/unified-prototype/unified-plugin/settings.gradle.kts index ff131bc8..1864b16f 100644 --- a/unified-prototype/unified-plugin/settings.gradle.kts +++ b/unified-prototype/unified-plugin/settings.gradle.kts @@ -14,9 +14,11 @@ dependencyResolutionManagement { } includeBuild("build-logic") + include("plugin-android") include("plugin-jvm") include("plugin-kmp") +include("plugin-android-init") include("plugin-swift") include("plugin-cpp") include("plugin-common")