diff --git a/templates/multiplatform-library-template/.gitignore b/templates/multiplatform-library-template/.gitignore new file mode 100644 index 00000000000..ba8435b9c5c --- /dev/null +++ b/templates/multiplatform-library-template/.gitignore @@ -0,0 +1,15 @@ +*.iml +.gradle +/local.properties +/.idea +/.idea/caches +/.idea/libraries +/.idea/modules.xml +/.idea/workspace.xml +/.idea/navEditor.xml +/.idea/assetWizardSettings.xml +.DS_Store +build/ +/captures +.externalNativeBuild +.cxx \ No newline at end of file diff --git a/templates/multiplatform-library-template/README.md b/templates/multiplatform-library-template/README.md new file mode 100644 index 00000000000..9f953e8cb1c --- /dev/null +++ b/templates/multiplatform-library-template/README.md @@ -0,0 +1,12 @@ +Compose Multiplatform Application + +**Common** +- `./gradlew publishToMavenLocal` - publish the library to the local Maven repository (`~/.m2`) + +- `./gradlew publish -Ppublish.url=http://repo2.mycompany.com/maven2 -Ppublish.username=user -Ppublish.password=pass` - publish the library to the external maven repository. + +**Desktop** +- `./gradlew run` - run desktop demo application + +**Android** +- `./gradlew installDebug` - install Android demo application on an Android device (on a real device or on an emulator) \ No newline at end of file diff --git a/templates/multiplatform-library-template/build.gradle.kts b/templates/multiplatform-library-template/build.gradle.kts new file mode 100644 index 00000000000..70409dafba1 --- /dev/null +++ b/templates/multiplatform-library-template/build.gradle.kts @@ -0,0 +1,34 @@ +plugins { + // this is necessary to avoid the plugins to be loaded multiple times + // in each subproject's classloader + kotlin("jvm") apply false + kotlin("multiplatform") apply false + kotlin("android") apply false + id("com.android.application") apply false + id("com.android.library") apply false + id("org.jetbrains.compose") apply false +} + +subprojects { + version = property("version")!! + + repositories { + google() + mavenCentral() + maven("https://maven.pkg.jetbrains.space/public/p/compose/dev") + } + + plugins.withId("java") { + extensions.findByType(JavaPluginExtension::class.java)?.apply { + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 + + withJavadocJar() + withSourcesJar() + } + } + + tasks.withType() { + kotlinOptions.jvmTarget = "11" + } +} \ No newline at end of file diff --git a/templates/multiplatform-library-template/demo/android/build.gradle.kts b/templates/multiplatform-library-template/demo/android/build.gradle.kts new file mode 100644 index 00000000000..9716b7ce500 --- /dev/null +++ b/templates/multiplatform-library-template/demo/android/build.gradle.kts @@ -0,0 +1,24 @@ +plugins { + id("com.android.application") + kotlin("android") + id("org.jetbrains.compose") +} + +android { + compileSdk = 31 + + defaultConfig { + minSdk = 21 + targetSdk = 31 + } + + compileOptions { + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 + } +} + +dependencies { + implementation(project(":library")) + implementation("androidx.activity:activity-compose:1.4.0") +} \ No newline at end of file diff --git a/templates/multiplatform-library-template/demo/android/src/main/AndroidManifest.xml b/templates/multiplatform-library-template/demo/android/src/main/AndroidManifest.xml new file mode 100644 index 00000000000..7a6e9751c0f --- /dev/null +++ b/templates/multiplatform-library-template/demo/android/src/main/AndroidManifest.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/templates/multiplatform-library-template/demo/android/src/main/java/com/mylibrary/demo/MainActivity.kt b/templates/multiplatform-library-template/demo/android/src/main/java/com/mylibrary/demo/MainActivity.kt new file mode 100644 index 00000000000..1db725f6722 --- /dev/null +++ b/templates/multiplatform-library-template/demo/android/src/main/java/com/mylibrary/demo/MainActivity.kt @@ -0,0 +1,16 @@ +package com.mylibrary.demo + +import android.os.Bundle +import androidx.activity.compose.setContent +import androidx.appcompat.app.AppCompatActivity +import com.mylibrary.HelloWidget + +class MainActivity : AppCompatActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + + setContent { + HelloWidget() + } + } +} \ No newline at end of file diff --git a/templates/multiplatform-library-template/demo/android/src/main/res/drawable-v24/ic_launcher_foreground.xml b/templates/multiplatform-library-template/demo/android/src/main/res/drawable-v24/ic_launcher_foreground.xml new file mode 100644 index 00000000000..2b068d11462 --- /dev/null +++ b/templates/multiplatform-library-template/demo/android/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/templates/multiplatform-library-template/demo/android/src/main/res/drawable/ic_launcher_background.xml b/templates/multiplatform-library-template/demo/android/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 00000000000..07d5da9cbf1 --- /dev/null +++ b/templates/multiplatform-library-template/demo/android/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/templates/multiplatform-library-template/demo/android/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/templates/multiplatform-library-template/demo/android/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 00000000000..eca70cfe52e --- /dev/null +++ b/templates/multiplatform-library-template/demo/android/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/templates/multiplatform-library-template/demo/android/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/templates/multiplatform-library-template/demo/android/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 00000000000..eca70cfe52e --- /dev/null +++ b/templates/multiplatform-library-template/demo/android/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/templates/multiplatform-library-template/demo/android/src/main/res/mipmap-hdpi/ic_launcher.png b/templates/multiplatform-library-template/demo/android/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 00000000000..a571e60098c Binary files /dev/null and b/templates/multiplatform-library-template/demo/android/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/templates/multiplatform-library-template/demo/android/src/main/res/mipmap-hdpi/ic_launcher_round.png b/templates/multiplatform-library-template/demo/android/src/main/res/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 00000000000..61da551c559 Binary files /dev/null and b/templates/multiplatform-library-template/demo/android/src/main/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/templates/multiplatform-library-template/demo/android/src/main/res/mipmap-mdpi/ic_launcher.png b/templates/multiplatform-library-template/demo/android/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 00000000000..c41dd285319 Binary files /dev/null and b/templates/multiplatform-library-template/demo/android/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/templates/multiplatform-library-template/demo/android/src/main/res/mipmap-mdpi/ic_launcher_round.png b/templates/multiplatform-library-template/demo/android/src/main/res/mipmap-mdpi/ic_launcher_round.png new file mode 100644 index 00000000000..db5080a7527 Binary files /dev/null and b/templates/multiplatform-library-template/demo/android/src/main/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/templates/multiplatform-library-template/demo/android/src/main/res/mipmap-xhdpi/ic_launcher.png b/templates/multiplatform-library-template/demo/android/src/main/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 00000000000..6dba46dab19 Binary files /dev/null and b/templates/multiplatform-library-template/demo/android/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/templates/multiplatform-library-template/demo/android/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/templates/multiplatform-library-template/demo/android/src/main/res/mipmap-xhdpi/ic_launcher_round.png new file mode 100644 index 00000000000..da31a871c8d Binary files /dev/null and b/templates/multiplatform-library-template/demo/android/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/templates/multiplatform-library-template/demo/android/src/main/res/mipmap-xxhdpi/ic_launcher.png b/templates/multiplatform-library-template/demo/android/src/main/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 00000000000..15ac681720f Binary files /dev/null and b/templates/multiplatform-library-template/demo/android/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/templates/multiplatform-library-template/demo/android/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/templates/multiplatform-library-template/demo/android/src/main/res/mipmap-xxhdpi/ic_launcher_round.png new file mode 100644 index 00000000000..b216f2d313c Binary files /dev/null and b/templates/multiplatform-library-template/demo/android/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/templates/multiplatform-library-template/demo/android/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/templates/multiplatform-library-template/demo/android/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 00000000000..f25a4197447 Binary files /dev/null and b/templates/multiplatform-library-template/demo/android/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/templates/multiplatform-library-template/demo/android/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/templates/multiplatform-library-template/demo/android/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png new file mode 100644 index 00000000000..e96783ccce8 Binary files /dev/null and b/templates/multiplatform-library-template/demo/android/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/templates/multiplatform-library-template/demo/android/src/main/res/values/strings.xml b/templates/multiplatform-library-template/demo/android/src/main/res/values/strings.xml new file mode 100644 index 00000000000..735a0709f28 --- /dev/null +++ b/templates/multiplatform-library-template/demo/android/src/main/res/values/strings.xml @@ -0,0 +1,3 @@ + + Library demo + \ No newline at end of file diff --git a/templates/multiplatform-library-template/demo/desktop/build.gradle.kts b/templates/multiplatform-library-template/demo/desktop/build.gradle.kts new file mode 100644 index 00000000000..24f5b4d24b8 --- /dev/null +++ b/templates/multiplatform-library-template/demo/desktop/build.gradle.kts @@ -0,0 +1,24 @@ +import org.jetbrains.compose.compose + +plugins { + kotlin("multiplatform") + id("org.jetbrains.compose") +} + +kotlin { + jvm("desktop") + sourceSets { + named("desktopMain") { + dependencies { + implementation(compose.desktop.currentOs) + implementation(project(":library")) + } + } + } +} + +compose.desktop { + application { + mainClass = "org.mylibrary.demo.MainKt" + } +} diff --git a/templates/multiplatform-library-template/demo/desktop/src/desktopMain/kotlin/com/mylibrary/demo/Main.kt b/templates/multiplatform-library-template/demo/desktop/src/desktopMain/kotlin/com/mylibrary/demo/Main.kt new file mode 100644 index 00000000000..e63f3e30d0c --- /dev/null +++ b/templates/multiplatform-library-template/demo/desktop/src/desktopMain/kotlin/com/mylibrary/demo/Main.kt @@ -0,0 +1,10 @@ +package com.mylibrary.demo + +import androidx.compose.ui.window.singleWindowApplication +import com.mylibrary.HelloWidget + +fun main() = singleWindowApplication( + title = "Library demo" +) { + HelloWidget() +} \ No newline at end of file diff --git a/templates/multiplatform-library-template/gradle.properties b/templates/multiplatform-library-template/gradle.properties new file mode 100644 index 00000000000..d53115773dc --- /dev/null +++ b/templates/multiplatform-library-template/gradle.properties @@ -0,0 +1,8 @@ +org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 +android.useAndroidX=true +android.enableJetifier=true +kotlin.code.style=official +version=1.0.0 +kotlin.version=1.6.10 +agp.version=7.0.4 +compose.version=1.1.0 diff --git a/templates/multiplatform-library-template/gradle/wrapper/gradle-wrapper.jar b/templates/multiplatform-library-template/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 00000000000..62d4c053550 Binary files /dev/null and b/templates/multiplatform-library-template/gradle/wrapper/gradle-wrapper.jar differ diff --git a/templates/multiplatform-library-template/gradle/wrapper/gradle-wrapper.properties b/templates/multiplatform-library-template/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000000..2e6e5897b52 --- /dev/null +++ b/templates/multiplatform-library-template/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/templates/multiplatform-library-template/gradlew b/templates/multiplatform-library-template/gradlew new file mode 100755 index 00000000000..2fe81a7d95e --- /dev/null +++ b/templates/multiplatform-library-template/gradlew @@ -0,0 +1,183 @@ +#!/usr/bin/env sh + +# +# Copyright 2015 the original author or 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. +# + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# 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"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# 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 + ;; + 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" + which java >/dev/null 2>&1 || 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 + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=`expr $i + 1` + done + case $i in + 0) set -- ;; + 1) set -- "$args0" ;; + 2) set -- "$args0" "$args1" ;; + 3) set -- "$args0" "$args1" "$args2" ;; + 4) set -- "$args0" "$args1" "$args2" "$args3" ;; + 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=`save "$@"` + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +exec "$JAVACMD" "$@" diff --git a/templates/multiplatform-library-template/gradlew.bat b/templates/multiplatform-library-template/gradlew.bat new file mode 100644 index 00000000000..9618d8d9607 --- /dev/null +++ b/templates/multiplatform-library-template/gradlew.bat @@ -0,0 +1,100 @@ +@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 + +@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=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@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%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +: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 %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="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! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/templates/multiplatform-library-template/library/build.gradle.kts b/templates/multiplatform-library-template/library/build.gradle.kts new file mode 100644 index 00000000000..b1d19c06d64 --- /dev/null +++ b/templates/multiplatform-library-template/library/build.gradle.kts @@ -0,0 +1,84 @@ +import org.jetbrains.compose.compose + +plugins { + id("com.android.library") + kotlin("multiplatform") + id("org.jetbrains.compose") + id("maven-publish") +} + +group = "com.mylibrary" + +kotlin { + android { + publishLibraryVariants("release") + } + jvm("desktop") + + sourceSets { + named("commonMain") { + dependencies { + api(compose.runtime) + api(compose.foundation) + api(compose.material) + // Needed only for preview + implementation(compose.preview) + } + } + named("androidMain") { + dependencies { + api("androidx.appcompat:appcompat:1.3.1") + api("androidx.core:core-ktx:1.6.0") + } + } + } +} + +android { + compileSdk = 31 + + defaultConfig { + minSdk = 21 + targetSdk = 31 + } + + compileOptions { + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 + } + + sourceSets { + named("main") { + manifest.srcFile("src/androidMain/AndroidManifest.xml") + res.srcDirs("src/androidMain/res") + } + } +} + +configure { + publications { + all { + this as MavenPublication + + pom { + this.name.set("Library for Compose Multiplatform") + licenses { + license { + this.name.set("The Apache License, Version 2.0") + url.set("http://www.apache.org/licenses/LICENSE-2.0.txt") + } + } + } + } + } + + repositories { + maven { + setUrl(findProperty("publish.url")?.toString().orEmpty()) + credentials { + username = findProperty("publish.username")?.toString().orEmpty() + password = findProperty("publish.password")?.toString().orEmpty() + } + } + } +} diff --git a/templates/multiplatform-library-template/library/src/androidMain/AndroidManifest.xml b/templates/multiplatform-library-template/library/src/androidMain/AndroidManifest.xml new file mode 100644 index 00000000000..9e7985fd6fb --- /dev/null +++ b/templates/multiplatform-library-template/library/src/androidMain/AndroidManifest.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/templates/multiplatform-library-template/library/src/androidMain/kotlin/com/mylibrary/HelloWidgetAndroid.kt b/templates/multiplatform-library-template/library/src/androidMain/kotlin/com/mylibrary/HelloWidgetAndroid.kt new file mode 100644 index 00000000000..b19c2291a6f --- /dev/null +++ b/templates/multiplatform-library-template/library/src/androidMain/kotlin/com/mylibrary/HelloWidgetAndroid.kt @@ -0,0 +1,3 @@ +package com.mylibrary + +actual fun getPlatformName(): String = "Android" \ No newline at end of file diff --git a/templates/multiplatform-library-template/library/src/commonMain/kotlin/com/mylibrary/HelloWidget.kt b/templates/multiplatform-library-template/library/src/commonMain/kotlin/com/mylibrary/HelloWidget.kt new file mode 100644 index 00000000000..880a14695be --- /dev/null +++ b/templates/multiplatform-library-template/library/src/commonMain/kotlin/com/mylibrary/HelloWidget.kt @@ -0,0 +1,25 @@ +package com.mylibrary + +import androidx.compose.material.Button +import androidx.compose.material.MaterialTheme +import androidx.compose.material.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue + +@Composable +fun HelloWidget() { + MaterialTheme { + var text by remember { mutableStateOf("Hello, World!") } + + Button(onClick = { + text = "Hello, ${getPlatformName()}" + }) { + Text(text) + } + } +} + +expect fun getPlatformName(): String \ No newline at end of file diff --git a/templates/multiplatform-library-template/library/src/desktopMain/kotlin/com/mylibrary/HelloWidgetDesktop.kt b/templates/multiplatform-library-template/library/src/desktopMain/kotlin/com/mylibrary/HelloWidgetDesktop.kt new file mode 100644 index 00000000000..53c3bca0cc1 --- /dev/null +++ b/templates/multiplatform-library-template/library/src/desktopMain/kotlin/com/mylibrary/HelloWidgetDesktop.kt @@ -0,0 +1,12 @@ +package com.mylibrary + +import androidx.compose.desktop.ui.tooling.preview.Preview +import androidx.compose.runtime.Composable + +actual fun getPlatformName(): String = "Desktop" + +@Preview +@Composable +fun HelloWidgetPreview() { + HelloWidget() +} \ No newline at end of file diff --git a/templates/multiplatform-library-template/settings.gradle.kts b/templates/multiplatform-library-template/settings.gradle.kts new file mode 100644 index 00000000000..b42b9bff80b --- /dev/null +++ b/templates/multiplatform-library-template/settings.gradle.kts @@ -0,0 +1,22 @@ +pluginManagement { + repositories { + gradlePluginPortal() + mavenCentral() + maven("https://maven.pkg.jetbrains.space/public/p/compose/dev") + google() + } + + plugins { + kotlin("jvm").version(extra["kotlin.version"] as String) + kotlin("multiplatform").version(extra["kotlin.version"] as String) + kotlin("android").version(extra["kotlin.version"] as String) + id("com.android.application").version(extra["agp.version"] as String) + id("com.android.library").version(extra["agp.version"] as String) + id("org.jetbrains.compose").version(extra["compose.version"] as String) + } +} + + +include(":library") +include(":demo:desktop") +include(":demo:android") \ No newline at end of file diff --git a/templates/multiplatform-template/common/build.gradle.kts b/templates/multiplatform-template/common/build.gradle.kts index e9dea64bcf7..1cea38d58d7 100644 --- a/templates/multiplatform-template/common/build.gradle.kts +++ b/templates/multiplatform-template/common/build.gradle.kts @@ -30,11 +30,11 @@ kotlin { } android { - compileSdkVersion(31) + compileSdk = 31 defaultConfig { - minSdkVersion(21) - targetSdkVersion(31) + minSdk = 21 + targetSdk = 31 } compileOptions {