diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..2286727 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,7 @@ +root = true + +[*.{kt,kts}] +ktlint_standard_filename = disabled +ktlint_standard_no-wildcard-imports = disabled +ktlint_standard_function-naming = disabled +ktlint_function_naming_ignore_when_annotated_with=Composable \ No newline at end of file diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9291ea6 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,5 @@ +sample/** linguist-detectable +sample/** -linguist-documentation +sample/**/*.xml -linguist-detectable +sample/**/*.plist -linguist-detectable +*.kts linguist-language=Kotlin \ No newline at end of file diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..25c27fd --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,25 @@ +name: Build Multiplatform project +on: + push: + branches: + - main + - feature/ci_support + pull_request: + +jobs: + build-multiplatform-project: + strategy: + fail-fast: false + matrix: + os: [ubuntu-20.04, macos-12, windows-2022] + gradle: [8.3] + runs-on: ${{ matrix.os }} + steps: + - uses: actions/checkout@v3 + - uses: actions/setup-java@v3 + with: + distribution: 'corretto' + java-version: '17' + - name: Build Multiplatform project + shell: bash + run: ./gradlew assemble \ No newline at end of file diff --git a/.github/workflows/code_style.yml b/.github/workflows/code_style.yml new file mode 100644 index 0000000..8909e00 --- /dev/null +++ b/.github/workflows/code_style.yml @@ -0,0 +1,20 @@ +name: Check code style +on: + push: + branches: + - main + - feature/ci_support + pull_request: + +jobs: + check-code-style: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - uses: actions/setup-java@v3 + with: + distribution: 'corretto' + java-version: '17' + - name: Check code style + shell: bash + run: ./gradlew ktlintCheck \ No newline at end of file diff --git a/.github/workflows/wiki.yml b/.github/workflows/wiki.yml new file mode 100644 index 0000000..19bb02b --- /dev/null +++ b/.github/workflows/wiki.yml @@ -0,0 +1,43 @@ +name: Publish Wiki +on: + push: + branches: + - main + paths-ignore: + - sample + +concurrency: + group: publish-wiki + cancel-in-progress: true + +jobs: + publish-wiki: + runs-on: ubuntu-latest + + permissions: + contents: write + + steps: + - name: Checkout repository + uses: actions/checkout@v4 + with: + submodules: 'recursive' + + - name: Setup Java + uses: actions/setup-java@v3 + with: + distribution: temurin + java-version: 17 + + - name: Setup Gradle + uses: gradle/gradle-build-action@v2 + + - name: Generate Wiki + run: ./gradlew dokkaHtmlMultiModule + + - name: Upload Wiki + uses: JamesIves/github-pages-deploy-action@v4 + with: + folder: ./build/dokka/htmlMultiModule + branch: gh-pages + force: true \ No newline at end of file diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..5ef510c --- /dev/null +++ b/.gitignore @@ -0,0 +1,68 @@ +*.iml +.gradle +/local.properties +/.idea +.DS_Store +build/ +/captures +.externalNativeBuild +.cxx +sample/iosApp/Podfile.lock +sample/iosApp/Pods/* +sample/iosApp/iosApp.xcworkspace/* +sample/iosApp/iosApp.xcodeproj/* +!sample/iosApp/iosApp.xcodeproj/project.pbxproj +shared/shared.podspec + +# Built application files +*.apk +*.ap_ + +# Files for the ART/Dalvik VM +*.dex + +# Java class files +*.class + +# Generated files +bin/ +gen/ +out/ + + +# Local configuration file (sdk path, etc) +local.properties + +# Proguard folder generated by Eclipse +proguard/ + +# Log Files +*.log + +# Android Studio Navigation editor temp files +.navigation/ + +# Android Studio captures folder +captures/ + +# Intellij +.idea/workspace.xml +.idea/tasks.xml +.idea/gradle.xml +.idea/dictionaries +.idea/libraries +app/.idea/ + +# Mac +*.DS_Store + +# Keystore files +*.jks + +# Google Services (e.g. APIs or Firebase) +google-services.json + +# Freeline +freeline.py +freeline/ +freeline_project_description.json \ No newline at end of file diff --git a/.hooks/README.md b/.hooks/README.md new file mode 100644 index 0000000..c7ddb44 --- /dev/null +++ b/.hooks/README.md @@ -0,0 +1,2 @@ +# Install Git Hooks +`./gradlew setUpGitHooks` diff --git a/.hooks/pre-commit b/.hooks/pre-commit new file mode 100755 index 0000000..170b910 --- /dev/null +++ b/.hooks/pre-commit @@ -0,0 +1,19 @@ +#!/bin/sh +# Auto format Kotlin files in the staging area +CHANGED_FILES="$(git --no-pager diff --name-only --cached --diff-filter=ACMRTUXB --relative | grep '\.kt[s"]\?$')" +if [ -z "$CHANGED_FILES" ]; then + echo "No Kotlin staged files." +else + echo "Running ktlint format over these files:" + echo "$CHANGED_FILES" + if ! (echo "$CHANGED_FILES" | xargs ./tools/ktlint --format --relative); then + exit $? + else + echo "Completed ktlint run." + echo "$CHANGED_FILES" | while read -r file; do + if [ -f "$file" ]; then + git add "$file" + fi + done + fi +fi diff --git a/.run/desktopApp.run.xml b/.run/desktopApp.run.xml new file mode 100644 index 0000000..57d2fc8 --- /dev/null +++ b/.run/desktopApp.run.xml @@ -0,0 +1,23 @@ + + + + + + + true + true + false + + + \ No newline at end of file diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 0000000..244380c --- /dev/null +++ b/LICENSE.txt @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright 2020-2021 JetBrains s.r.o. and and respective authors and developers. + + 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 + + http://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. diff --git a/README.md b/README.md new file mode 100644 index 0000000..e69de29 diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 0000000..a261b45 --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,26 @@ +plugins { + // this is necessary to avoid the plugins to be loaded multiple times + // in each subproject's classloader + kotlin("multiplatform").apply(false) + id("com.android.application").apply(false) + id("com.android.library").apply(false) + id("org.jetbrains.compose").apply(false) + id("com.vanniktech.maven.publish").apply(false) + id("org.jetbrains.dokka") + id("org.jlleitschuh.gradle.ktlint") +} + +subprojects { + apply(plugin = "org.jlleitschuh.gradle.ktlint") // Version should be inherited from parent + + // Optionally configure plugin + configure { + version.set("1.0.1") + } +} + +tasks.register("setUpGitHooks") { + group = "help" + from("$rootDir/.hooks") + into("$rootDir/.git/hooks") +} diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..277fdb8 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,27 @@ +#Gradle +org.gradle.jvmargs=-Xmx2048M -Dkotlin.daemon.jvm.options\="-Xmx2048M" + +#Kotlin +kotlin.code.style=official + +#MPP +kotlin.mpp.stability.nowarn=true +kotlin.mpp.enableCInteropCommonization=true +kotlin.mpp.androidSourceSetLayoutVersion=2 + +#Compose +org.jetbrains.compose.experimental.uikit.enabled=true + +#Android +android.useAndroidX=true +android.compileSdk=34 +android.targetSdk=34 +android.minSdk=24 + +#Versions +kotlin.version=1.9.10 +agp.version=8.1.1 +compose.version=1.5.3 +dokka.version=1.9.0 +klint.version=11.6.1 +maven-publish.version=0.25.3 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml new file mode 100644 index 0000000..9a86979 --- /dev/null +++ b/gradle/libs.versions.toml @@ -0,0 +1,19 @@ +[versions] +agp = "8.0.2" +kotlin = "1.9.0" +nexus-publish = "2.0.0-rc-1" +android-minSdk = "24" +android-compileSdk = "33" +ktor-client = "2.3.6" +ktor-client-mock="2.3.6" + + +[libraries] +ktor-client = { module = "io.ktor:ktor-client-core", version.ref = "ktor-client" } +ktor-client-mock = { module = "io.ktor:ktor-client-mock", version.ref = "ktor-client-mock" } +kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" } + +[plugins] +androidLibrary = { id = "com.android.library", version.ref = "agp" } +kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" } + diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..249e583 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..84a0b92 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..a69d9cb --- /dev/null +++ b/gradlew @@ -0,0 +1,240 @@ +#!/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. +# + +############################################################################## +# +# 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/master/subprojects/plugins/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 + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit + +APP_NAME="Gradle" +APP_BASE_NAME=${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 "$*" +} >&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 + 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" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + 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 + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +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/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..f127cfd --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,91 @@ +@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 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. +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 execute + +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 + +: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/ktor-boost/build.gradle.kts b/ktor-boost/build.gradle.kts new file mode 100644 index 0000000..b22281f --- /dev/null +++ b/ktor-boost/build.gradle.kts @@ -0,0 +1,113 @@ +import com.vanniktech.maven.publish.SonatypeHost + +plugins { + kotlin("multiplatform") + id("com.android.library") + id("org.jetbrains.dokka") + id("com.vanniktech.maven.publish") +} + +kotlin { + androidTarget { + publishLibraryVariants("release") + } + jvm("desktop") + + // jvm() + + listOf( + iosX64(), + iosArm64(), + iosSimulatorArm64(), + ).forEach { iosTarget -> + iosTarget.binaries.framework { + baseName = "ktor-boost" + isStatic = true + } + } + + sourceSets { + val commonMain by getting { + dependencies { + implementation(libs.ktor.client) + } + } + val commonTest by getting { + dependencies { + implementation(libs.ktor.client.mock) + implementation(libs.kotlin.test) + } + } + val androidMain by getting { + dependencies { + } + } + val iosX64Main by getting + val iosArm64Main by getting + val iosSimulatorArm64Main by getting + val iosMain by creating { + dependsOn(commonMain) + iosX64Main.dependsOn(this) + iosArm64Main.dependsOn(this) + iosSimulatorArm64Main.dependsOn(this) + } + val desktopMain by getting { + dependencies { + } + } + } +} + +android { + compileSdk = (findProperty("android.compileSdk") as String).toInt() + namespace = "com.androidpoet.ktor.boost" + + sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml") + sourceSets["main"].res.srcDirs("src/androidMain/res") + sourceSets["main"].resources.srcDirs("src/commonMain/resources") + + defaultConfig { + minSdk = (findProperty("android.minSdk") as String).toInt() + } + compileOptions { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + } + kotlin { + jvmToolchain(17) + } +} + +mavenPublishing { +// publishToMavenCentral(SonatypeHost.DEFAULT) + // or when publishing to https://s01.oss.sonatype.org + publishToMavenCentral(SonatypeHost.S01, automaticRelease = true) + signAllPublications() + coordinates("io.github.androidpoet", "ktor-boost", "0.0.9") + + pom { + name.set("ktor-boost") + description.set("Simplifying Ktor for Easier Development.") + inceptionYear.set("2023") + url.set("https://github.com/AndroidPoet/KtorBoost/") + licenses { + license { + name.set("The Apache License, Version 2.0") + url.set("http://www.apache.org/licenses/LICENSE-2.0.txt") + distribution.set("http://www.apache.org/licenses/LICENSE-2.0.txt") + } + } + developers { + developer { + id.set("ranbirk66") + name.set("Ranbir Singh") + url.set("https://github.com/androidpoet/") + } + } + scm { + url.set("https://github.com/AndroidPoet/KtorBoost/") + connection.set("scm:git:git://github.com/AndroidPoet/KtorBoost.git") + developerConnection.set("scm:git:ssh://github.com/AndroidPoet/KtorBoost.git") + } + } +} diff --git a/ktor-boost/src/androidMain/AndroidManifest.xml b/ktor-boost/src/androidMain/AndroidManifest.xml new file mode 100644 index 0000000..568741e --- /dev/null +++ b/ktor-boost/src/androidMain/AndroidManifest.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/ktor-boost/src/androidMain/kotlin/getPlatformName.kt b/ktor-boost/src/androidMain/kotlin/getPlatformName.kt new file mode 100644 index 0000000..2094c63 --- /dev/null +++ b/ktor-boost/src/androidMain/kotlin/getPlatformName.kt @@ -0,0 +1,5 @@ + + +actual fun getPlatformName(): String { + return "Android" +} diff --git a/ktor-boost/src/commonMain/kotlin/KtorDeferredResultExtension.kt b/ktor-boost/src/commonMain/kotlin/KtorDeferredResultExtension.kt new file mode 100644 index 0000000..a9b580e --- /dev/null +++ b/ktor-boost/src/commonMain/kotlin/KtorDeferredResultExtension.kt @@ -0,0 +1,118 @@ +import io.ktor.client.HttpClient +import io.ktor.client.call.body +import io.ktor.client.request.HttpRequestBuilder +import io.ktor.client.request.delete +import io.ktor.client.request.get +import io.ktor.client.request.head +import io.ktor.client.request.options +import io.ktor.client.request.patch +import io.ktor.client.request.post +import io.ktor.client.request.put +import kotlinx.coroutines.Deferred +import kotlinx.coroutines.async +import kotlinx.coroutines.coroutineScope + +/** + * Executes an asynchronous HTTP GET request using the provided URL. + * + * @param urlString The URL for the GET request. + * @param block Optional, allows customization of the request using HttpRequestBuilder. + * @return A Deferred> representing the asynchronous operation. + */ +public suspend inline fun HttpClient.getResultAsync( + urlString: String, + noinline block: HttpRequestBuilder.() -> Unit = {}, +): Deferred> = + coroutineScope { + async { runCatching { get(urlString, block).body() } } + } + +/** + * Executes an asynchronous HTTP POST request using the provided URL. + * + * @param urlString The URL for the POST request. + * @param block Optional, allows customization of the request using HttpRequestBuilder. + * @return A Deferred> representing the asynchronous operation. + */ +public suspend inline fun HttpClient.postResultAsync( + urlString: String, + noinline block: HttpRequestBuilder.() -> Unit = {}, +): Deferred> = + coroutineScope { + async { runCatching { post(urlString, block).body() } } + } + +/** + * Executes an asynchronous HTTP PUT request using the provided URL. + * + * @param urlString The URL for the PUT request. + * @param block Optional, allows customization of the request using HttpRequestBuilder. + * @return A Deferred> representing the asynchronous operation. + */ +public suspend inline fun HttpClient.putResultAsync( + urlString: String, + noinline block: HttpRequestBuilder.() -> Unit = {}, +): Deferred> = + coroutineScope { + async { runCatching { put(urlString, block).body() } } + } + +/** + * Executes an asynchronous HTTP DELETE request using the provided URL. + * + * @param urlString The URL for the DELETE request. + * @param block Optional, allows customization of the request using HttpRequestBuilder. + * @return A Deferred> representing the asynchronous operation. + */ +public suspend inline fun HttpClient.deleteResultAsync( + urlString: String, + noinline block: HttpRequestBuilder.() -> Unit = {}, +): Deferred> = + coroutineScope { + async { runCatching { delete(urlString, block).body() } } + } + +/** + * Executes an asynchronous HTTP PATCH request using the provided URL. + * + * @param urlString The URL for the PATCH request. + * @param block Optional, allows customization of the request using HttpRequestBuilder. + * @return A Deferred> representing the asynchronous operation. + */ +public suspend inline fun HttpClient.patchResultAsync( + urlString: String, + noinline block: HttpRequestBuilder.() -> Unit = {}, +): Deferred> = + coroutineScope { + async { runCatching { patch(urlString, block).body() } } + } + +/** + * Executes an asynchronous HTTP HEAD request using the provided URL. + * + * @param urlString The URL for the HEAD request. + * @param block Optional, allows customization of the request using HttpRequestBuilder. + * @return A Deferred> representing the asynchronous operation. + */ +public suspend inline fun HttpClient.headResultAsync( + urlString: String, + noinline block: HttpRequestBuilder.() -> Unit = {}, +): Deferred> = + coroutineScope { + async { runCatching { head(urlString, block).body() } } + } + +/** + * Executes an asynchronous HTTP OPTIONS request using the provided URL. + * + * @param urlString The URL for the OPTIONS request. + * @param block Optional, allows customization of the request using HttpRequestBuilder. + * @return A Deferred> representing the asynchronous operation. + */ +public suspend inline fun HttpClient.optionsResultAsync( + urlString: String, + noinline block: HttpRequestBuilder.() -> Unit = {}, +): Deferred> = + coroutineScope { + async { runCatching { options(urlString, block).body() } } + } diff --git a/ktor-boost/src/commonMain/kotlin/KtorResultExtension.kt b/ktor-boost/src/commonMain/kotlin/KtorResultExtension.kt new file mode 100644 index 0000000..80663a7 --- /dev/null +++ b/ktor-boost/src/commonMain/kotlin/KtorResultExtension.kt @@ -0,0 +1,94 @@ +import io.ktor.client.HttpClient +import io.ktor.client.call.body +import io.ktor.client.request.HttpRequestBuilder +import io.ktor.client.request.delete +import io.ktor.client.request.get +import io.ktor.client.request.head +import io.ktor.client.request.options +import io.ktor.client.request.patch +import io.ktor.client.request.post +import io.ktor.client.request.put + +/** + * Performs an HTTP GET request synchronously and returns the result as a [Result] of type [T]. + * + * @param urlString The URL for the GET request. + * @param block Optional, allows customization of the request using HttpRequestBuilder. + * @return Result representing the synchronous operation. + */ +suspend inline fun HttpClient.getResult( + urlString: String, + noinline block: HttpRequestBuilder.() -> Unit = {}, +): Result = runCatching { get(urlString, block).body() } + +/** + * Performs an HTTP POST request synchronously and returns the result as a [Result] of type [T]. + * + * @param urlString The URL for the POST request. + * @param block Optional, allows customization of the request using HttpRequestBuilder. + * @return Result representing the synchronous operation. + */ +suspend inline fun HttpClient.postResult( + urlString: String, + noinline block: HttpRequestBuilder.() -> Unit = {}, +): Result = runCatching { post(urlString, block).body() } + +/** + * Performs an HTTP PUT request synchronously and returns the result as a [Result] of type [T]. + * + * @param urlString The URL for the PUT request. + * @param block Optional, allows customization of the request using HttpRequestBuilder. + * @return Result representing the synchronous operation. + */ +suspend inline fun HttpClient.putResult( + urlString: String, + noinline block: HttpRequestBuilder.() -> Unit = {}, +): Result = runCatching { put(urlString, block).body() } + +/** + * Performs an HTTP DELETE request synchronously and returns the result as a [Result] of type [T]. + * + * @param urlString The URL for the DELETE request. + * @param block Optional, allows customization of the request using HttpRequestBuilder. + * @return Result representing the synchronous operation. + */ +suspend inline fun HttpClient.deleteResult( + urlString: String, + noinline block: HttpRequestBuilder.() -> Unit = {}, +): Result = runCatching { delete(urlString, block).body() } + +/** + * Performs an HTTP PATCH request synchronously and returns the result as a [Result] of type [T]. + * + * @param urlString The URL for the PATCH request. + * @param block Optional, allows customization of the request using HttpRequestBuilder. + * @return Result representing the synchronous operation. + */ +suspend inline fun HttpClient.patchResult( + urlString: String, + noinline block: HttpRequestBuilder.() -> Unit = {}, +): Result = runCatching { patch(urlString, block).body() } + +/** + * Performs an HTTP HEAD request synchronously and returns the result as a [Result] of type [T]. + * + * @param urlString The URL for the HEAD request. + * @param block Optional, allows customization of the request using HttpRequestBuilder. + * @return Result representing the synchronous operation. + */ +suspend inline fun HttpClient.headResult( + urlString: String, + noinline block: HttpRequestBuilder.() -> Unit = {}, +): Result = runCatching { head(urlString, block).body() } + +/** + * Performs an HTTP OPTIONS request synchronously and returns the result as a [Result] of type [T]. + * + * @param urlString The URL for the OPTIONS request. + * @param block Optional, allows customization of the request using HttpRequestBuilder. + * @return Result representing the synchronous operation. + */ +suspend inline fun HttpClient.optionsResult( + urlString: String, + noinline block: HttpRequestBuilder.() -> Unit = {}, +): Result = runCatching { options(urlString, block).body() } diff --git a/ktor-boost/src/commonMain/kotlin/ResultExtensions.kt b/ktor-boost/src/commonMain/kotlin/ResultExtensions.kt new file mode 100644 index 0000000..fb863d4 --- /dev/null +++ b/ktor-boost/src/commonMain/kotlin/ResultExtensions.kt @@ -0,0 +1,120 @@ +import kotlin.contracts.ExperimentalContracts +import kotlin.contracts.InvocationKind +import kotlin.contracts.contract + +// https://github.com/skydoves/retrofit-adapters/blob/main/retrofit-adapters-result/src/main/kotlin/com/skydoves/retrofit/adapters/result/ResultExtensions.kt + +/** + * Executes a suspend function [block] within a try-catch and returns the result as a [Result]. + * + * @param block A suspend function that returns a result. + * @return Result representing the success or failure of the provided suspend function. + */ +public suspend inline fun runCatchingSuspend(crossinline block: suspend () -> R): Result { + return try { + Result.success(block()) + } catch (e: Throwable) { + Result.failure(e) + } +} + +/** + * Executes a suspend function [block] on the receiver [T] within a try-catch and returns the result as a [Result]. + * + * @param block A suspend function that returns a result, acting on the receiver [T]. + * @return Result representing the success or failure of the provided suspend function. + */ +public suspend inline fun T.runCatchingSuspend(crossinline block: suspend T.() -> R): Result { + return try { + Result.success(block()) + } catch (e: Throwable) { + Result.failure(e) + } +} + +/** + * Executes a suspend function [action] if the current result is a success. + * + * @param action A suspend function to be executed if the result is a success. + * @return The current Result instance. + */ +@OptIn(ExperimentalContracts::class) +public suspend inline fun Result.onSuccessSuspend(crossinline action: suspend (value: T) -> Unit): Result { + contract { + callsInPlace(action, InvocationKind.AT_MOST_ONCE) + } + if (isSuccess) action(getOrThrow()) + return this +} + +/** + * Executes a suspend function [action] if the current result is a failure. + * + * @param action A suspend function to be executed if the result is a failure. + * @return The current Result instance. + */ +@OptIn(ExperimentalContracts::class) +public suspend inline fun Result.onFailureSuspend(crossinline action: suspend (exception: Throwable) -> Unit): Result { + contract { + callsInPlace(action, InvocationKind.AT_MOST_ONCE) + } + exceptionOrNull()?.let { action(it) } + return this +} + +/** + * Performs a fold operation on the Result, executing [onSuccess] if the Result is a success, + * or [onFailure] if the Result is a failure. + * + * @param onSuccess A suspend function to be executed on success. + * @param onFailure A suspend function to be executed on failure. + * @return Result of applying the corresponding function based on the current Result state. + */ +@OptIn(ExperimentalContracts::class) +public suspend inline fun Result.foldSuspend( + crossinline onSuccess: suspend (value: T) -> R, + crossinline onFailure: suspend (exception: Throwable) -> R, +): R { + contract { + callsInPlace(onSuccess, InvocationKind.AT_MOST_ONCE) + callsInPlace(onFailure, InvocationKind.AT_MOST_ONCE) + } + return when (val exception = exceptionOrNull()) { + null -> onSuccess(getOrThrow()) + else -> onFailure(exception) + } +} + +/** + * Performs a mapping operation on the Result, transforming the value if the Result is a success. + * + * @param transform A suspend function to transform the value on success. + * @return Result representing the transformed value or failure based on the current Result state. + */ +@OptIn(ExperimentalContracts::class) +public suspend inline fun Result.mapSuspend(crossinline transform: suspend (value: T) -> R): Result { + contract { + callsInPlace(transform, InvocationKind.AT_MOST_ONCE) + } + return when { + isSuccess -> Result.success(transform(getOrThrow())) + else -> Result.failure(exceptionOrNull()!!) + } +} + +/** + * Recovers from a failure by executing [transform] to create a new value if the Result is a failure. + * + * @param transform A suspend function to transform the exception on failure. + * @return Result representing the recovered value or original success based on the current Result state. + */ +@OptIn(ExperimentalContracts::class) +public suspend inline fun Result.recoverSuspend(crossinline transform: suspend (exception: Throwable) -> R): Result { + contract { + callsInPlace(transform, InvocationKind.AT_MOST_ONCE) + } + return when (val exception = exceptionOrNull()) { + null -> this + else -> Result.success(transform(exception)) + } +} diff --git a/ktor-boost/src/commonMain/kotlin/SampleLib.kt b/ktor-boost/src/commonMain/kotlin/SampleLib.kt new file mode 100644 index 0000000..6bed2c0 --- /dev/null +++ b/ktor-boost/src/commonMain/kotlin/SampleLib.kt @@ -0,0 +1,3 @@ + + +expect fun getPlatformName(): String diff --git a/ktor-boost/src/commonTest/kotlin/HttpClientExtensionsTest.kt b/ktor-boost/src/commonTest/kotlin/HttpClientExtensionsTest.kt new file mode 100644 index 0000000..583881a --- /dev/null +++ b/ktor-boost/src/commonTest/kotlin/HttpClientExtensionsTest.kt @@ -0,0 +1,114 @@ +import io.ktor.client.* +import io.ktor.client.engine.mock.* +import io.ktor.client.request.* +import io.ktor.http.* +import kotlinx.coroutines.runBlocking +import kotlin.test.Test +import kotlin.test.assertEquals +import kotlin.test.assertNotNull +import kotlin.test.assertTrue + +class HttpClientExtensionsTest { + private val mockEngine = + MockEngine { request -> + val responseContent = + when (request.method) { + HttpMethod.Get -> "get success" + HttpMethod.Post -> "post success" + HttpMethod.Put -> "put success" + HttpMethod.Delete -> "delete success" + HttpMethod.Patch -> "patch success" + HttpMethod.Head -> "head success" + HttpMethod.Options -> "options success" + else -> "" // Handle other methods if needed + } + respondOk(responseContent) + } + + private val httpClient = HttpClient(mockEngine) + + @Test + fun `test getResult extension function`() { + runBlocking { + val result = httpClient.getResult("sample_get_url") + + println(result.toString()) + + assertTrue(result.isSuccess) + val responseBody = result.getOrNull() + assertNotNull(responseBody) + assertEquals("get success", responseBody) + } + } + + @Test + fun `test postResult extension function`() { + runBlocking { + val result = httpClient.postResult("sample_post_url") + assertTrue(result.isSuccess) + val responseBody = result.getOrNull() + assertNotNull(responseBody) + assertEquals("post success", responseBody) + } + } + + @Test + fun `test putResult extension function`() { + runBlocking { + val result = httpClient.putResult("sample_put_url") + + assertTrue(result.isSuccess) + val responseBody = result.getOrNull() + assertNotNull(responseBody) + assertEquals("put success", responseBody) + } + } + + @Test + fun `test deleteResult extension function`() { + runBlocking { + val result = httpClient.deleteResult("sample_delete_url") + + assertTrue(result.isSuccess) + val responseBody = result.getOrNull() + assertNotNull(responseBody) + assertEquals("delete success", responseBody) + } + } + + @Test + fun `test patchResult extension function`() { + runBlocking { + val result = httpClient.patchResult("sample_patch_url") + + assertTrue(result.isSuccess) + val responseBody = result.getOrNull() + assertNotNull(responseBody) + assertEquals("patch success", responseBody) + } + } + + @Test + fun `test headResult extension function`() { + runBlocking { + val result = httpClient.headResult("sample_head_url") + + assertTrue(result.isSuccess) + val responseBody = result.getOrNull() + assertNotNull(responseBody) + assertEquals("head success", responseBody) + } + } + + @Test + fun `test optionsResult extension function`() { + runBlocking { + val result = httpClient.optionsResult("sample_options_url") + + assertTrue(result.isSuccess) + val responseBody = result.getOrNull() + assertNotNull(responseBody) + assertEquals("options success", responseBody) + } + } +} diff --git a/ktor-boost/src/desktopMain/kotlin/getPlatformName.kt b/ktor-boost/src/desktopMain/kotlin/getPlatformName.kt new file mode 100644 index 0000000..9b4f7f3 --- /dev/null +++ b/ktor-boost/src/desktopMain/kotlin/getPlatformName.kt @@ -0,0 +1,5 @@ + + +actual fun getPlatformName(): String { + return "Desktop" +} diff --git a/ktor-boost/src/iosMain/kotlin/getPlatformName.kt b/ktor-boost/src/iosMain/kotlin/getPlatformName.kt new file mode 100644 index 0000000..3a2b5b4 --- /dev/null +++ b/ktor-boost/src/iosMain/kotlin/getPlatformName.kt @@ -0,0 +1,5 @@ + + +actual fun getPlatformName(): String { + return "iOS" +} diff --git a/sample/androidApp/build.gradle.kts b/sample/androidApp/build.gradle.kts new file mode 100644 index 0000000..e95a165 --- /dev/null +++ b/sample/androidApp/build.gradle.kts @@ -0,0 +1,38 @@ +plugins { + kotlin("multiplatform") + id("com.android.application") + id("org.jetbrains.compose") +} + +kotlin { + androidTarget() + sourceSets { + val androidMain by getting { + dependencies { + implementation(project(":sample:shared")) + } + } + } +} + +android { + compileSdk = (findProperty("android.compileSdk") as String).toInt() + namespace = "com.myapplication" + + sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml") + + defaultConfig { + applicationId = "com.myapplication.MyApplication" + minSdk = (findProperty("android.minSdk") as String).toInt() + targetSdk = (findProperty("android.targetSdk") as String).toInt() + versionCode = 1 + versionName = "1.0" + } + compileOptions { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + } + kotlin { + jvmToolchain(17) + } +} diff --git a/sample/androidApp/src/androidMain/AndroidManifest.xml b/sample/androidApp/src/androidMain/AndroidManifest.xml new file mode 100644 index 0000000..86ce26f --- /dev/null +++ b/sample/androidApp/src/androidMain/AndroidManifest.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + diff --git a/sample/androidApp/src/androidMain/kotlin/com/myapplication/MainActivity.kt b/sample/androidApp/src/androidMain/kotlin/com/myapplication/MainActivity.kt new file mode 100644 index 0000000..306bcd6 --- /dev/null +++ b/sample/androidApp/src/androidMain/kotlin/com/myapplication/MainActivity.kt @@ -0,0 +1,16 @@ +package com.myapplication + +import MainView +import android.os.Bundle +import androidx.activity.compose.setContent +import androidx.appcompat.app.AppCompatActivity + +class MainActivity : AppCompatActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + + setContent { + MainView() + } + } +} diff --git a/sample/androidApp/src/androidMain/res/drawable-v24/ic_launcher_foreground.xml b/sample/androidApp/src/androidMain/res/drawable-v24/ic_launcher_foreground.xml new file mode 100644 index 0000000..2b068d1 --- /dev/null +++ b/sample/androidApp/src/androidMain/res/drawable-v24/ic_launcher_foreground.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/sample/androidApp/src/androidMain/res/drawable/ic_launcher_background.xml b/sample/androidApp/src/androidMain/res/drawable/ic_launcher_background.xml new file mode 100644 index 0000000..07d5da9 --- /dev/null +++ b/sample/androidApp/src/androidMain/res/drawable/ic_launcher_background.xml @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sample/androidApp/src/androidMain/res/mipmap-anydpi-v26/ic_launcher.xml b/sample/androidApp/src/androidMain/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..eca70cf --- /dev/null +++ b/sample/androidApp/src/androidMain/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/sample/androidApp/src/androidMain/res/mipmap-anydpi-v26/ic_launcher_round.xml b/sample/androidApp/src/androidMain/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..eca70cf --- /dev/null +++ b/sample/androidApp/src/androidMain/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/sample/androidApp/src/androidMain/res/mipmap-hdpi/ic_launcher.png b/sample/androidApp/src/androidMain/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000..a571e60 Binary files /dev/null and b/sample/androidApp/src/androidMain/res/mipmap-hdpi/ic_launcher.png differ diff --git a/sample/androidApp/src/androidMain/res/mipmap-hdpi/ic_launcher_round.png b/sample/androidApp/src/androidMain/res/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 0000000..61da551 Binary files /dev/null and b/sample/androidApp/src/androidMain/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/sample/androidApp/src/androidMain/res/mipmap-mdpi/ic_launcher.png b/sample/androidApp/src/androidMain/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000..c41dd28 Binary files /dev/null and b/sample/androidApp/src/androidMain/res/mipmap-mdpi/ic_launcher.png differ diff --git a/sample/androidApp/src/androidMain/res/mipmap-mdpi/ic_launcher_round.png b/sample/androidApp/src/androidMain/res/mipmap-mdpi/ic_launcher_round.png new file mode 100644 index 0000000..db5080a Binary files /dev/null and b/sample/androidApp/src/androidMain/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/sample/androidApp/src/androidMain/res/mipmap-xhdpi/ic_launcher.png b/sample/androidApp/src/androidMain/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 0000000..6dba46d Binary files /dev/null and b/sample/androidApp/src/androidMain/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/sample/androidApp/src/androidMain/res/mipmap-xhdpi/ic_launcher_round.png b/sample/androidApp/src/androidMain/res/mipmap-xhdpi/ic_launcher_round.png new file mode 100644 index 0000000..da31a87 Binary files /dev/null and b/sample/androidApp/src/androidMain/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/sample/androidApp/src/androidMain/res/mipmap-xxhdpi/ic_launcher.png b/sample/androidApp/src/androidMain/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 0000000..15ac681 Binary files /dev/null and b/sample/androidApp/src/androidMain/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/sample/androidApp/src/androidMain/res/mipmap-xxhdpi/ic_launcher_round.png b/sample/androidApp/src/androidMain/res/mipmap-xxhdpi/ic_launcher_round.png new file mode 100644 index 0000000..b216f2d Binary files /dev/null and b/sample/androidApp/src/androidMain/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/sample/androidApp/src/androidMain/res/mipmap-xxxhdpi/ic_launcher.png b/sample/androidApp/src/androidMain/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 0000000..f25a419 Binary files /dev/null and b/sample/androidApp/src/androidMain/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/sample/androidApp/src/androidMain/res/mipmap-xxxhdpi/ic_launcher_round.png b/sample/androidApp/src/androidMain/res/mipmap-xxxhdpi/ic_launcher_round.png new file mode 100644 index 0000000..e96783c Binary files /dev/null and b/sample/androidApp/src/androidMain/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/sample/androidApp/src/androidMain/res/values/strings.xml b/sample/androidApp/src/androidMain/res/values/strings.xml new file mode 100644 index 0000000..592270b --- /dev/null +++ b/sample/androidApp/src/androidMain/res/values/strings.xml @@ -0,0 +1,3 @@ + + My application + \ No newline at end of file diff --git a/sample/desktopApp/build.gradle.kts b/sample/desktopApp/build.gradle.kts new file mode 100644 index 0000000..0914ee5 --- /dev/null +++ b/sample/desktopApp/build.gradle.kts @@ -0,0 +1,30 @@ +import org.jetbrains.compose.desktop.application.dsl.TargetFormat + +plugins { + kotlin("multiplatform") + id("org.jetbrains.compose") +} + +kotlin { + jvm() + sourceSets { + val jvmMain by getting { + dependencies { + implementation(compose.desktop.currentOs) + implementation(project(":sample:shared")) + } + } + } +} + +compose.desktop { + application { + mainClass = "MainKt" + + nativeDistributions { + targetFormats(TargetFormat.Dmg, TargetFormat.Msi, TargetFormat.Deb) + packageName = "KotlinMultiplatformComposeDesktopApplication" + packageVersion = "1.0.0" + } + } +} diff --git a/sample/desktopApp/src/jvmMain/kotlin/main.kt b/sample/desktopApp/src/jvmMain/kotlin/main.kt new file mode 100644 index 0000000..2c5d4b9 --- /dev/null +++ b/sample/desktopApp/src/jvmMain/kotlin/main.kt @@ -0,0 +1,9 @@ +import androidx.compose.ui.window.Window +import androidx.compose.ui.window.application + +fun main() = + application { + Window(onCloseRequest = ::exitApplication) { + MainView() + } + } diff --git a/sample/iosApp/Configuration/Config.xcconfig b/sample/iosApp/Configuration/Config.xcconfig new file mode 100644 index 0000000..f391597 --- /dev/null +++ b/sample/iosApp/Configuration/Config.xcconfig @@ -0,0 +1,3 @@ +TEAM_ID= +BUNDLE_ID=com.myapplication.MyApplication +APP_NAME=My application diff --git a/sample/iosApp/iosApp.xcodeproj/project.pbxproj b/sample/iosApp/iosApp.xcodeproj/project.pbxproj new file mode 100644 index 0000000..2849c44 --- /dev/null +++ b/sample/iosApp/iosApp.xcodeproj/project.pbxproj @@ -0,0 +1,396 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 50; + objects = { + +/* Begin PBXBuildFile section */ + 058557BB273AAA24004C7B11 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 058557BA273AAA24004C7B11 /* Assets.xcassets */; }; + 058557D9273AAEEB004C7B11 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 058557D8273AAEEB004C7B11 /* Preview Assets.xcassets */; }; + 2152FB042600AC8F00CF470E /* iOSApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2152FB032600AC8F00CF470E /* iOSApp.swift */; }; + 7555FF83242A565900829871 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7555FF82242A565900829871 /* ContentView.swift */; }; +/* End PBXBuildFile section */ + +/* Begin PBXFileReference section */ + 058557BA273AAA24004C7B11 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; + 058557D8273AAEEB004C7B11 /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = ""; }; + 2152FB032600AC8F00CF470E /* iOSApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = iOSApp.swift; sourceTree = ""; }; + 7555FF7B242A565900829871 /* My application.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "My application.app"; sourceTree = BUILT_PRODUCTS_DIR; }; + 7555FF82242A565900829871 /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = ""; }; + 7555FF8C242A565B00829871 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + AB3632DC29227652001CCB65 /* Config.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Config.xcconfig; sourceTree = ""; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + F85CB1118929364A9C6EFABC /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 058557D7273AAEEB004C7B11 /* Preview Content */ = { + isa = PBXGroup; + children = ( + 058557D8273AAEEB004C7B11 /* Preview Assets.xcassets */, + ); + path = "Preview Content"; + sourceTree = ""; + }; + 42799AB246E5F90AF97AA0EF /* Frameworks */ = { + isa = PBXGroup; + children = ( + ); + name = Frameworks; + sourceTree = ""; + }; + 7555FF72242A565900829871 = { + isa = PBXGroup; + children = ( + AB1DB47929225F7C00F7AF9C /* Configuration */, + 7555FF7D242A565900829871 /* iosApp */, + 7555FF7C242A565900829871 /* Products */, + 42799AB246E5F90AF97AA0EF /* Frameworks */, + ); + sourceTree = ""; + }; + 7555FF7C242A565900829871 /* Products */ = { + isa = PBXGroup; + children = ( + 7555FF7B242A565900829871 /* My application.app */, + ); + name = Products; + sourceTree = ""; + }; + 7555FF7D242A565900829871 /* iosApp */ = { + isa = PBXGroup; + children = ( + 058557BA273AAA24004C7B11 /* Assets.xcassets */, + 7555FF82242A565900829871 /* ContentView.swift */, + 7555FF8C242A565B00829871 /* Info.plist */, + 2152FB032600AC8F00CF470E /* iOSApp.swift */, + 058557D7273AAEEB004C7B11 /* Preview Content */, + ); + path = iosApp; + sourceTree = ""; + }; + AB1DB47929225F7C00F7AF9C /* Configuration */ = { + isa = PBXGroup; + children = ( + AB3632DC29227652001CCB65 /* Config.xcconfig */, + ); + path = Configuration; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXNativeTarget section */ + 7555FF7A242A565900829871 /* iosApp */ = { + isa = PBXNativeTarget; + buildConfigurationList = 7555FFA5242A565B00829871 /* Build configuration list for PBXNativeTarget "iosApp" */; + buildPhases = ( + 05D91A922A5F233C00F138EB /* Compile Kotlin */, + 7555FF77242A565900829871 /* Sources */, + 7555FF79242A565900829871 /* Resources */, + F85CB1118929364A9C6EFABC /* Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = iosApp; + productName = iosApp; + productReference = 7555FF7B242A565900829871 /* My application.app */; + productType = "com.apple.product-type.application"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + 7555FF73242A565900829871 /* Project object */ = { + isa = PBXProject; + attributes = { + LastSwiftUpdateCheck = 1130; + LastUpgradeCheck = 1130; + ORGANIZATIONNAME = orgName; + TargetAttributes = { + 7555FF7A242A565900829871 = { + CreatedOnToolsVersion = 11.3.1; + }; + }; + }; + buildConfigurationList = 7555FF76242A565900829871 /* Build configuration list for PBXProject "iosApp" */; + compatibilityVersion = "Xcode 9.3"; + developmentRegion = en; + hasScannedForEncodings = 0; + knownRegions = ( + en, + Base, + ); + mainGroup = 7555FF72242A565900829871; + productRefGroup = 7555FF7C242A565900829871 /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + 7555FF7A242A565900829871 /* iosApp */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXResourcesBuildPhase section */ + 7555FF79242A565900829871 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 058557D9273AAEEB004C7B11 /* Preview Assets.xcassets in Resources */, + 058557BB273AAA24004C7B11 /* Assets.xcassets in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXShellScriptBuildPhase section */ + 05D91A922A5F233C00F138EB /* Compile Kotlin */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + ); + name = "Compile Kotlin"; + outputFileListPaths = ( + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "cd \"$SRCROOT/../..\"\n./gradlew :sample:shared:embedAndSignAppleFrameworkForXcode"; + }; +/* End PBXShellScriptBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + 7555FF77242A565900829871 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 2152FB042600AC8F00CF470E /* iOSApp.swift in Sources */, + 7555FF83242A565900829871 /* ContentView.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin XCBuildConfiguration section */ + 7555FFA3242A565B00829871 /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = AB3632DC29227652001CCB65 /* Config.xcconfig */; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_ENABLE_OBJC_WEAK = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 14.1; + MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; + MTL_FAST_MATH = YES; + ONLY_ACTIVE_ARCH = YES; + SDKROOT = iphoneos; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + }; + name = Debug; + }; + 7555FFA4242A565B00829871 /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = AB3632DC29227652001CCB65 /* Config.xcconfig */; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_ENABLE_OBJC_WEAK = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 14.1; + MTL_ENABLE_DEBUG_INFO = NO; + MTL_FAST_MATH = YES; + SDKROOT = iphoneos; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-O"; + VALIDATE_PRODUCT = YES; + }; + name = Release; + }; + 7555FFA6242A565B00829871 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CODE_SIGN_IDENTITY = "Apple Development"; + CODE_SIGN_STYLE = Automatic; + DEVELOPMENT_ASSET_PATHS = "\"iosApp/Preview Content\""; + DEVELOPMENT_TEAM = "${TEAM_ID}"; + ENABLE_PREVIEWS = YES; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(SRCROOT)/../shared/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)", + ); + INFOPLIST_FILE = iosApp/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 14.1; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + OTHER_LDFLAGS = ( + "$(inherited)", + "-framework", + shared, + ); + PRODUCT_BUNDLE_IDENTIFIER = "${BUNDLE_ID}${TEAM_ID}"; + PRODUCT_NAME = "${APP_NAME}"; + PROVISIONING_PROFILE_SPECIFIER = ""; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = Debug; + }; + 7555FFA7242A565B00829871 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CODE_SIGN_IDENTITY = "Apple Development"; + CODE_SIGN_STYLE = Automatic; + DEVELOPMENT_ASSET_PATHS = "\"iosApp/Preview Content\""; + DEVELOPMENT_TEAM = "${TEAM_ID}"; + ENABLE_PREVIEWS = YES; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(SRCROOT)/../shared/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)", + ); + INFOPLIST_FILE = iosApp/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 14.1; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + OTHER_LDFLAGS = ( + "$(inherited)", + "-framework", + shared, + ); + PRODUCT_BUNDLE_IDENTIFIER = "${BUNDLE_ID}${TEAM_ID}"; + PRODUCT_NAME = "${APP_NAME}"; + PROVISIONING_PROFILE_SPECIFIER = ""; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + 7555FF76242A565900829871 /* Build configuration list for PBXProject "iosApp" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 7555FFA3242A565B00829871 /* Debug */, + 7555FFA4242A565B00829871 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 7555FFA5242A565B00829871 /* Build configuration list for PBXNativeTarget "iosApp" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 7555FFA6242A565B00829871 /* Debug */, + 7555FFA7242A565B00829871 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + }; + rootObject = 7555FF73242A565900829871 /* Project object */; +} diff --git a/sample/iosApp/iosApp/Assets.xcassets/AccentColor.colorset/Contents.json b/sample/iosApp/iosApp/Assets.xcassets/AccentColor.colorset/Contents.json new file mode 100644 index 0000000..ee7e3ca --- /dev/null +++ b/sample/iosApp/iosApp/Assets.xcassets/AccentColor.colorset/Contents.json @@ -0,0 +1,11 @@ +{ + "colors" : [ + { + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} \ No newline at end of file diff --git a/sample/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/Contents.json b/sample/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/Contents.json new file mode 100644 index 0000000..8edf56e --- /dev/null +++ b/sample/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -0,0 +1,14 @@ +{ + "images" : [ + { + "filename" : "app-icon-1024.png", + "idiom" : "universal", + "platform" : "ios", + "size" : "1024x1024" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/sample/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/app-icon-1024.png b/sample/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/app-icon-1024.png new file mode 100644 index 0000000..53fc536 Binary files /dev/null and b/sample/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/app-icon-1024.png differ diff --git a/sample/iosApp/iosApp/Assets.xcassets/Contents.json b/sample/iosApp/iosApp/Assets.xcassets/Contents.json new file mode 100644 index 0000000..4aa7c53 --- /dev/null +++ b/sample/iosApp/iosApp/Assets.xcassets/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} \ No newline at end of file diff --git a/sample/iosApp/iosApp/ContentView.swift b/sample/iosApp/iosApp/ContentView.swift new file mode 100644 index 0000000..f7f6457 --- /dev/null +++ b/sample/iosApp/iosApp/ContentView.swift @@ -0,0 +1,21 @@ +import UIKit +import SwiftUI +import shared + +struct ComposeView: UIViewControllerRepresentable { + func makeUIViewController(context: Context) -> UIViewController { + Main_iosKt.MainViewController() + } + + func updateUIViewController(_ uiViewController: UIViewController, context: Context) {} +} + +struct ContentView: View { + var body: some View { + ComposeView() + .ignoresSafeArea(.keyboard) // Compose has own keyboard handler + } +} + + + diff --git a/sample/iosApp/iosApp/Info.plist b/sample/iosApp/iosApp/Info.plist new file mode 100644 index 0000000..412e378 --- /dev/null +++ b/sample/iosApp/iosApp/Info.plist @@ -0,0 +1,50 @@ + + + + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + $(PRODUCT_BUNDLE_PACKAGE_TYPE) + CFBundleShortVersionString + 1.0 + CFBundleVersion + 1 + LSRequiresIPhoneOS + + CADisableMinimumFrameDurationOnPhone + + UIApplicationSceneManifest + + UIApplicationSupportsMultipleScenes + + + UILaunchScreen + + UIRequiredDeviceCapabilities + + armv7 + + UISupportedInterfaceOrientations + + UIInterfaceOrientationPortrait + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + UISupportedInterfaceOrientations~ipad + + UIInterfaceOrientationPortrait + UIInterfaceOrientationPortraitUpsideDown + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + + diff --git a/sample/iosApp/iosApp/Preview Content/Preview Assets.xcassets/Contents.json b/sample/iosApp/iosApp/Preview Content/Preview Assets.xcassets/Contents.json new file mode 100644 index 0000000..4aa7c53 --- /dev/null +++ b/sample/iosApp/iosApp/Preview Content/Preview Assets.xcassets/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} \ No newline at end of file diff --git a/sample/iosApp/iosApp/iOSApp.swift b/sample/iosApp/iosApp/iOSApp.swift new file mode 100644 index 0000000..0648e86 --- /dev/null +++ b/sample/iosApp/iosApp/iOSApp.swift @@ -0,0 +1,10 @@ +import SwiftUI + +@main +struct iOSApp: App { + var body: some Scene { + WindowGroup { + ContentView() + } + } +} \ No newline at end of file diff --git a/sample/shared/build.gradle.kts b/sample/shared/build.gradle.kts new file mode 100644 index 0000000..17997f4 --- /dev/null +++ b/sample/shared/build.gradle.kts @@ -0,0 +1,76 @@ +plugins { + kotlin("multiplatform") + id("com.android.library") + id("org.jetbrains.compose") +} + +kotlin { + androidTarget() + + jvm("desktop") + + listOf( + iosX64(), + iosArm64(), + iosSimulatorArm64(), + ).forEach { iosTarget -> + iosTarget.binaries.framework { + baseName = "shared" + isStatic = true + } + } + + sourceSets { + val commonMain by getting { + dependencies { + implementation(compose.runtime) + implementation(compose.foundation) + implementation(compose.material) + @OptIn(org.jetbrains.compose.ExperimentalComposeLibrary::class) + implementation(compose.components.resources) + // implementation(project(":ktor-boost")) + } + } + val androidMain by getting { + dependencies { + api("androidx.activity:activity-compose:1.7.2") + api("androidx.appcompat:appcompat:1.6.1") + api("androidx.core:core-ktx:1.10.1") + } + } + val iosX64Main by getting + val iosArm64Main by getting + val iosSimulatorArm64Main by getting + val iosMain by creating { + dependsOn(commonMain) + iosX64Main.dependsOn(this) + iosArm64Main.dependsOn(this) + iosSimulatorArm64Main.dependsOn(this) + } + val desktopMain by getting { + dependencies { + implementation(compose.desktop.common) + } + } + } +} + +android { + compileSdk = (findProperty("android.compileSdk") as String).toInt() + namespace = "com.androidpoet.ktor.boost.sample" + + sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml") + sourceSets["main"].res.srcDirs("src/androidMain/res") + sourceSets["main"].resources.srcDirs("src/commonMain/resources") + + defaultConfig { + minSdk = (findProperty("android.minSdk") as String).toInt() + } + compileOptions { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + } + kotlin { + jvmToolchain(17) + } +} diff --git a/sample/shared/src/androidMain/AndroidManifest.xml b/sample/shared/src/androidMain/AndroidManifest.xml new file mode 100644 index 0000000..568741e --- /dev/null +++ b/sample/shared/src/androidMain/AndroidManifest.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/sample/shared/src/androidMain/kotlin/main.android.kt b/sample/shared/src/androidMain/kotlin/main.android.kt new file mode 100644 index 0000000..d5723a2 --- /dev/null +++ b/sample/shared/src/androidMain/kotlin/main.android.kt @@ -0,0 +1,5 @@ +import androidx.compose.runtime.Composable + +actual fun getPlatformName(): String = "Android" + +@Composable fun MainView() = App() diff --git a/sample/shared/src/commonMain/kotlin/App.kt b/sample/shared/src/commonMain/kotlin/App.kt new file mode 100644 index 0000000..ff98047 --- /dev/null +++ b/sample/shared/src/commonMain/kotlin/App.kt @@ -0,0 +1,41 @@ +import androidx.compose.animation.AnimatedVisibility +import androidx.compose.foundation.Image +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.fillMaxWidth +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 +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import org.jetbrains.compose.resources.ExperimentalResourceApi +import org.jetbrains.compose.resources.painterResource + +@OptIn(ExperimentalResourceApi::class) +@Composable +fun App() { + MaterialTheme { + var greetingText by remember { mutableStateOf("Hello, World!") } + var showImage by remember { mutableStateOf(false) } + Column(Modifier.fillMaxWidth(), horizontalAlignment = Alignment.CenterHorizontally) { + Button(onClick = { + greetingText = "Hello, ${getPlatformName()}" + showImage = !showImage + }) { + Text(greetingText) + } + AnimatedVisibility(showImage) { + Image( + painterResource("compose-multiplatform.xml"), + contentDescription = "Compose Multiplatform icon", + ) + } + } + } +} + +expect fun getPlatformName(): String diff --git a/sample/shared/src/commonMain/resources/compose-multiplatform.xml b/sample/shared/src/commonMain/resources/compose-multiplatform.xml new file mode 100644 index 0000000..d7bf795 --- /dev/null +++ b/sample/shared/src/commonMain/resources/compose-multiplatform.xml @@ -0,0 +1,36 @@ + + + + + + + + diff --git a/sample/shared/src/desktopMain/kotlin/main.desktop.kt b/sample/shared/src/desktopMain/kotlin/main.desktop.kt new file mode 100644 index 0000000..3802916 --- /dev/null +++ b/sample/shared/src/desktopMain/kotlin/main.desktop.kt @@ -0,0 +1,12 @@ +import androidx.compose.desktop.ui.tooling.preview.Preview +import androidx.compose.runtime.Composable + +actual fun getPlatformName(): String = "Desktop" + +@Composable fun MainView() = App() + +@Preview +@Composable +fun AppPreview() { + App() +} diff --git a/sample/shared/src/iosMain/kotlin/main.ios.kt b/sample/shared/src/iosMain/kotlin/main.ios.kt new file mode 100644 index 0000000..5c10a82 --- /dev/null +++ b/sample/shared/src/iosMain/kotlin/main.ios.kt @@ -0,0 +1,5 @@ +import androidx.compose.ui.window.ComposeUIViewController + +actual fun getPlatformName(): String = "iOS" + +fun MainViewController() = ComposeUIViewController { App() } diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 0000000..cc6dba2 --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1,48 @@ +rootProject.name = "Ktor Boost" + +include(":sample:androidApp") +include(":ktor-boost") +include(":sample:desktopApp") +include(":sample:shared") + +pluginManagement { + repositories { + gradlePluginPortal() + mavenCentral() + google() + maven("https://maven.pkg.jetbrains.space/public/p/compose/dev") + } + + plugins { + val kotlinVersion = extra["kotlin.version"] as String + val agpVersion = extra["agp.version"] as String + val composeVersion = extra["compose.version"] as String + val dokkaVersion = extra["dokka.version"] as String + val klintVersion = extra["klint.version"] as String + val mavenPublishVersion = extra["maven-publish.version"] as String + + kotlin("jvm").version(kotlinVersion) + kotlin("multiplatform").version(kotlinVersion) + kotlin("android").version(kotlinVersion) + + id("com.android.application").version(agpVersion) + id("com.android.library").version(agpVersion) + + id("org.jetbrains.compose").version(composeVersion) + id("org.jetbrains.dokka").version(dokkaVersion) + id("org.jlleitschuh.gradle.ktlint").version(klintVersion) + id("com.vanniktech.maven.publish").version(mavenPublishVersion) + } +} + +plugins { + id("org.gradle.toolchains.foojay-resolver-convention") version("0.4.0") +} + +dependencyResolutionManagement { + repositories { + mavenCentral() + google() + maven("https://maven.pkg.jetbrains.space/public/p/compose/dev") + } +} diff --git a/tools/ktlint b/tools/ktlint new file mode 100755 index 0000000..ff7e4e8 Binary files /dev/null and b/tools/ktlint differ