From 102c42e2ee949e785118004d157926d98eab5a6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martynas=20Petu=C5=A1ka?= Date: Sat, 19 Jun 2021 20:14:38 +0100 Subject: [PATCH] Develop (#8) * Conventions Rework * Conventions Rework * Conventions Rework * Conventions Rework * Conventions Rework * Conventions Rework * GH Actions fixes * Kotlin 1.5.0 * Kotlin 1.5.20-RC * Kotlin 1.5.30-dev-2423 * Kotlin 1.5.30-dev-2423 * Kotlin 1.5.30-dev-2423 * Kotlin 1.5.30-dev-2423 * Kotlin 1.5.30-dev-2423 * Kotlin 1.5.30-dev-2423 * Kotlin 1.5.30-dev-2423 * Kotlin 1.5.30-dev-2423 * Kotlin 1.5.30-dev-2423 * Kotlin 1.5.30-dev-2423 * Kotlin 1.5.30-dev-2423 * Kotlin 1.5.30-dev-2423 * Kotlin 1.5.30-dev-2423 * Kotlin 1.5.30-dev-2423 * Kotlin 1.5.30-dev-2423 * Kotlin 1.5.30-dev-2423 * Kotlin 1.5.30-dev-2423 * Kotlin 1.5.30-dev-2423 * Kotlin 1.5.30-dev-2423 * Kotlin 1.5.30-dev-2423 * Kotlin 1.5.30-dev-2423 --- .github/workflows/check.yml | 7 +- .github/workflows/release.yml | 81 +++++--- .gitignore | 1 + README.md | 70 ++++++- build.gradle.kts | 37 ++-- buildSrc/build.gradle.kts | 4 + buildSrc/gradle.properties | 7 +- buildSrc/settings.gradle.kts | 13 +- .../main/kotlin/convention.common.gradle.kts | 25 +++ .../main/kotlin/convention.library.gradle.kts | 113 +++++++++++ .../convention.publishing-nexus.gradle.kts | 13 ++ .../kotlin/convention.publishing.gradle.kts | 174 +++++++++++++++++ buildSrc/src/main/kotlin/{util => }/gradle.kt | 2 - .../local.common-conventions.gradle.kts | 5 - .../local.library-conventions.gradle.kts | 169 ----------------- .../src/main/kotlin/util/nativeTargetGroup.kt | 47 ++--- gradle.properties | 16 +- gradle/wrapper/gradle-wrapper.jar | Bin 59203 -> 59536 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 2 +- gradlew.bat | 178 +++++++++--------- .../build.gradle.kts | 2 +- .../src/androidNdkMain/kotlin/platform.kt | 2 +- .../src/commonMain/kotlin/CoreLib.kt | 2 +- .../src/commonTest/kotlin/CoreLibTest.kt | 4 +- .../src/iosMain/kotlin/platform.kt | 2 +- .../src/jsMain/kotlin/platform.kt | 2 +- .../src/jvmMain/kotlin/platform.kt | 2 +- .../src/linuxMain/kotlin/platform.kt | 2 +- .../src/macosX64Main/kotlin/platform.kt | 2 +- .../src/mingwMain/kotlin/platform.kt | 3 + .../src/mingwX64Main/kotlin/platform.kt | 3 - .../src/mingwX86Main/kotlin/platform.kt | 3 - .../src/tvosMain/kotlin/platform.kt | 2 +- .../src/watchosMain/kotlin/platform.kt | 2 +- lib/template-kmp-library-dsl/build.gradle.kts | 2 +- .../src/androidNdkMain/kotlin/platform.kt | 2 +- .../src/commonMain/kotlin/DslLib.kt | 2 +- .../src/commonTest/kotlin/DslLibTest.kt | 4 +- .../src/iosMain/kotlin/platform.kt | 2 +- .../src/jsMain/kotlin/platform.kt | 2 +- .../src/jvmMain/kotlin/platform.kt | 2 +- .../src/linuxMain/kotlin/platform.kt | 2 +- .../src/macosX64Main/kotlin/platform.kt | 2 +- .../src/mingwMain/kotlin/platform.kt | 3 + .../src/mingwX64Main/kotlin/platform.kt | 3 - .../src/mingwX86Main/kotlin/platform.kt | 3 - .../src/tvosMain/kotlin/platform.kt | 2 +- .../src/watchosMain/kotlin/platform.kt | 2 +- sandbox/build.gradle.kts | 15 +- sandbox/gradle | 1 + sandbox/gradlew | 1 + sandbox/gradlew.bat | 1 + sandbox/settings.gradle.kts | 1 + sandbox/src/main/kotlin/main.kt | 8 +- sandbox/src/test/kotlin/MainTest.kt | 6 +- settings.gradle.kts | 15 +- src/commonMain/kotlin/placeholder.kt | 2 +- test/build.gradle.kts | 6 +- .../androidNdkMain/kotlin/runBlockingTest.kt | 2 +- test/src/commonMain/kotlin/runBlockingTest.kt | 2 +- test/src/iosMain/kotlin/runBlockingTest.kt | 2 +- test/src/jsMain/kotlin/runBlockingTest.kt | 2 +- test/src/jvmMain/kotlin/runBlockingTest.kt | 2 +- .../kotlin/runBlockingTest.kt | 2 +- .../linuxArm64Main/kotlin/runBlockingTest.kt | 2 +- .../linuxMips32Main/kotlin/runBlockingTest.kt | 2 +- .../kotlin/runBlockingTest.kt | 2 +- .../linuxX64Main/kotlin/runBlockingTest.kt | 2 +- .../macosX64Main/kotlin/runBlockingTest.kt | 2 +- .../mingwX64Main/kotlin/runBlockingTest.kt | 2 +- .../mingwX86Main/kotlin/runBlockingTest.kt | 2 +- test/src/tvosMain/kotlin/runBlockingTest.kt | 2 +- .../kotlin/runBlockingTest.kt | 2 +- .../kotlin/runBlockingTest.kt | 2 +- .../watchosX64Main/kotlin/runBlockingTest.kt | 2 +- .../watchosX86Main/kotlin/runBlockingTest.kt | 2 +- versions.properties | 41 ++-- 78 files changed, 702 insertions(+), 463 deletions(-) create mode 100644 buildSrc/src/main/kotlin/convention.common.gradle.kts create mode 100644 buildSrc/src/main/kotlin/convention.library.gradle.kts create mode 100644 buildSrc/src/main/kotlin/convention.publishing-nexus.gradle.kts create mode 100644 buildSrc/src/main/kotlin/convention.publishing.gradle.kts rename buildSrc/src/main/kotlin/{util => }/gradle.kt (98%) delete mode 100644 buildSrc/src/main/kotlin/local.common-conventions.gradle.kts delete mode 100644 buildSrc/src/main/kotlin/local.library-conventions.gradle.kts create mode 100644 lib/template-kmp-library-core/src/mingwMain/kotlin/platform.kt delete mode 100644 lib/template-kmp-library-core/src/mingwX64Main/kotlin/platform.kt delete mode 100644 lib/template-kmp-library-core/src/mingwX86Main/kotlin/platform.kt create mode 100644 lib/template-kmp-library-dsl/src/mingwMain/kotlin/platform.kt delete mode 100644 lib/template-kmp-library-dsl/src/mingwX64Main/kotlin/platform.kt delete mode 100644 lib/template-kmp-library-dsl/src/mingwX86Main/kotlin/platform.kt create mode 120000 sandbox/gradle create mode 120000 sandbox/gradlew create mode 120000 sandbox/gradlew.bat create mode 100644 sandbox/settings.gradle.kts diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index ebcf955..33c3848 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -6,11 +6,14 @@ on: - '**' workflow_dispatch: +env: + GRADLE_OPTS: "-Dorg.gradle.daemon=false" + jobs: check: runs-on: ${{ matrix.os }} strategy: - max-parallel: 5 + fail-fast: false matrix: os: - macos-latest @@ -35,5 +38,5 @@ jobs: with: distribution: 'adopt' java-version: 11 - - run: ./gradlew check --info + - run: ./gradlew assemble check --info name: Gradle Check diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7495ecb..c6c8b70 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -6,14 +6,30 @@ on: version: required: true description: Package version to publish under + skipPages: + description: Should we skip releasing GitHub pages + required: false + default: "y" + skipGitHub: + description: Should we skip publishing artefacts to GitHub Packages + required: false + default: "y" + skipMavenCentral: + description: Should we skip publishing artefacts to Maven Central + required: false + default: "y" release: types: [ created ] +env: + VERSION: ${{ github.event.release.tag_name }} + GRADLE_OPTS: "-Dorg.gradle.daemon=false" + jobs: check: runs-on: ${{ matrix.os }} strategy: - max-parallel: 5 + fail-fast: false matrix: os: - macos-latest @@ -41,19 +57,37 @@ jobs: - run: ./gradlew check publishToMavenLocal --info name: Gradle Check - release-GitHub: + release-Artefacts: runs-on: ${{ matrix.os }} needs: [ check ] + env: + GH_USERNAME: ${{ github.actor }} + GH_PASSWORD: ${{ github.token }} + ORG_GRADLE_PROJECT_signingKey: ${{ secrets.SIGNING_KEY }} + ORG_GRADLE_PROJECT_signingKeyId: ${{ secrets.SIGNING_KEY_ID }} + ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.SIGNING_PASSWORD }} + ORG_GRADLE_PROJECT_sonatypeUsername: ${{ secrets.SONATYPE_USERNAME }} + ORG_GRADLE_PROJECT_sonatypePassword: ${{ secrets.SONATYPE_PASSWORD }} strategy: - max-parallel: 5 matrix: + repository: + - name: Github Packages + tasks: publishAllPublicationsToGitHubRepository + enabled: ${{ github.event.inputs.skipGitHub != 'y' && true }} + - name: Maven Central + # Requires to manually release a new version on https://s01.oss.sonatype.org/#stagingRepositories + # If you're brave, you could change it to `publishToSonatype closeAndReleaseSonatypeStagingRepository` to fully automate the release + tasks: publishToSonatype closeSonatypeStagingRepository + enabled: ${{ github.event.inputs.skipMavenCentral != 'y' && true }} os: - macos-latest - windows-latest - ubuntu-latest steps: - uses: actions/checkout@v2 + if: ${{ matrix.repository.enabled == true }} - name: Restore Gradle cache + if: ${{ matrix.repository.enabled == true }} id: cache uses: actions/cache@v2.1.6 with: @@ -67,23 +101,22 @@ jobs: restore-keys: | ${{ runner.os }}-gradle- - uses: actions/setup-java@v2 + if: ${{ matrix.repository.enabled == true }} with: distribution: 'adopt' java-version: 11 - - run: | + - name: Gradle Publish + if: ${{ matrix.repository.enabled == true }} + shell: bash + run: | VERSION=${VERSION:=${{ github.event.inputs.version }}} VERSION=${VERSION/v} - ./gradlew publish -Pversion=${VERSION//v} --info - shell: bash - name: Gradle Publish - env: - VERSION: ${{ github.event.release.tag_name }} - GH_USERNAME: ${{ github.actor }} - GH_PASSWORD: ${{ github.token }} + ./gradlew ${{ matrix.repository.tasks }} -Pversion=${VERSION//v} release-Dokka: runs-on: ubuntu-latest - needs: [release-GitHub] + needs: [check] + if: ${{ github.event.inputs.skipPages != 'y' }} steps: - uses: actions/checkout@v2 - name: Restore Gradle cache @@ -103,17 +136,21 @@ jobs: with: distribution: 'adopt' java-version: 11 - - uses: nick-invision/retry@v2 - name: Build Dokka - env: - JVM_ARGS: -XX:MaxMetaspaceSize=2g - with: - max_attempts: 3 - timeout_minutes: 30 - command: ./gradlew dokkaHtmlMultiModule --info - - uses: crazy-max/ghaction-github-pages@v2 + - name: Build Dokka Pages + shell: bash + run: | + VERSION=${VERSION:=${{ github.event.inputs.version }}} + VERSION=${VERSION/v} + REPO_NAME=${{ github.repository }} + REPO_NAME=${REPO_NAME#${{ github.repository_owner }}/} + ./gradlew dokkaHtmlMultiModule -Pversion=${VERSION//v}; + cp -avr build/dokka/htmlMultiModule/ public; + find public -type f -regex '.*\.\(htm\|html\|txt\|text\|js\|css\)$' -exec gzip -f -k {} \; + echo "/${REPO_NAME} /${REPO_NAME}/${REPO_NAME}/index.html 301" > public/_redirects; + echo "/${REPO_NAME}/index.html /${REPO_NAME}/${REPO_NAME}/index.html 301" >> public/_redirects; + - uses: crazy-max/ghaction-github-pages@v2.5.0 with: target_branch: gh-pages - build_dir: build/dokka/htmlMultiModule + build_dir: public env: GITHUB_TOKEN: ${{ github.token }} diff --git a/.gitignore b/.gitignore index 09e30f0..d7904b7 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ build/ .vscode/ local.properties *.hprof +lint.xml diff --git a/README.md b/README.md index 0096000..f87b65d 100644 --- a/README.md +++ b/README.md @@ -1,19 +1,85 @@ +[![Dokka docs](https://img.shields.io/badge/docs-dokka-orange?style=flat-square)](http://mpetuska.github.io/template-kmp-library) +[![Version maven-central](https://img.shields.io/maven-central/v/dev.petuska/template-kmp-library?logo=apache-maven&style=flat-square)](https://mvnrepository.com/artifact/dev.petuska/template-kmp-library/latest) + # template-kmp-library + Kotlin multiplatform library template. -Has a baseline setup for a multiplatform library supporting all kotlin [targets](https://kotlinlang.org/docs/mpp-supported-platforms.html) +Has a baseline setup for a multiplatform library supporting all +kotlin [targets](https://kotlinlang.org/docs/mpp-supported-platforms.html) except android (any help in getting that setup welcome) & deprecated wasm32. ## Features + * Native target grouping and shared sourceSets * Wrapper library module that declares dependencies on all lib modules -* Uniform configuration via conventional plugins `local.common-conventions` & `local.library-conventions` +* Uniform configuration via conventional plugins `convention.common`, `convention.library` & `convention.publishing` * Local `test` module for shared test utilities (a helper function to run coroutine tests in common sourceSet included) * Local `sandbox` module for easy library consumer side checks * Publication control to avoid multiple publications for targets that can be built on multiple hosts * `ktlint` plugin with automatic `git-hooks` * `refreshVersions` plugin for better library version control * Main host for publications can be changed via `gradle.properties#project.mainOS` property +* Gradle Build Scan setup * GH dependabot setup * GH release action for platform dependant publications * GH check action for platform dependant tests on PRs +* Maven Central publishing setup +* GH Packages publishing setup + +## Setup + +Here are some pointers to help you get up and running with this template + +### Badges + +This README contains some useful badges for your project. To tailor them to your artefacts the following changes needs +to be made: + +* `Dokka docs` - change the link as `(http://$GH_USERNAME.github.io/$GH_PROJECT_NAME)` +* `Version maven-central - change all occurrences of `dev.petuska` to your own group and `template-kmp-library` to your + root library name + +### gradle.properties + +Have a look at `gradle.properties` file and change these properties as needed + +* `gh.owner.id` - main library developer's username +* `gh.owner.name` - main library developer's name +* `gh.owner.email` - main library developer's email +* `project.mainOS` - main host to publish cross-platform artefacts from (to avoid duplicate publications) +* `group` - artefacts' group +* `description` - library description +* `version` - library version (overridden in CI, so doesn't really matter here) + +### Modules + +All the library modules should go to `/lib/` directory and be included in `/settings.gradle.kts`. There are already two +sample modules to illustrate how simple the setup is (`/lib/template-kmp-library-core` & `template-kmp-library-dsl`). +They both contain some sample code and tests that make use of local `/test` module with testing utilities. + +### Kotlin Targets + +The template comes packed with all kotlin targets preconfigured, however if you want to remove some of them or tweak the +config, you only need to make changes as needed in `/buildSrc/src/main/kotlin/convention.library.gradle.kts`. Removing +targets from this file will not break any publications as they're configured on top of pre-registered targets. + +### GitHub Actions + +The template also comes with GH actions to check builds on PRs and publish artefacts when creating a GH release. By +default, it'll publish to GH packages and Maven Central. However to fully unlock Maven Central publishing, you'll need +to add these secrets to your GH repository. If you want to quickly disable Maven Central publishing, you can toggle it +at `.github/workflows/release.yml#L80` + +* `SIGNING_KEY` - GPG signing key +* `SIGNING_KEY_ID` - GPG signing key ID +* `SIGNING_PASSWORD` - GPG signing key password (if set) +* `SONATYPE_PASSWORD` - Sonatype PAT username +* `SONATYPE_USERNAME` - Sonatype PAT password + +## Known Issues + +* [KT-46957](https://youtrack.jetbrains.com/issue/KT-46957) - Commonizer breaks for linuxMips32. This is fixed and + scheduled to be released in 1.5.30-M1. However, to make the setup work now, the template is currently using dev build + from kotlin snapshot repositories. If you'd like to use a stable kotlin version instead, remove linuxMips32 from linux + native target group in `/buildSrc/src/main/kotlin/convention.library.gradle.kts`. diff --git a/build.gradle.kts b/build.gradle.kts index 3e6d4d3..12074f0 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,19 +1,6 @@ plugins { - id("local.library-conventions") + id("convention.publishing-nexus") id("com.github.jakemarsden.git-hooks") - idea -} - -kotlin { - sourceSets { - commonMain { - dependencies { - subprojects.filter { it.path.startsWith(":lib:") }.forEach { - api(it) - } - } - } - } } gitHooks { @@ -21,14 +8,26 @@ gitHooks { mapOf( "post-checkout" to "ktlintApplyToIdea", "pre-commit" to "ktlintFormat", - "pre-push" to "check" + "pre-push" to "ktlintCheck" ) ) } -idea { - module { - isDownloadSources = true - isDownloadJavadoc = true +gradleEnterprise { + buildScan { + termsOfServiceUrl = "https://gradle.com/terms-of-service" + termsOfServiceAgree = "yes" + } +} + +kotlin { + sourceSets { + commonMain { + dependencies { + subprojects.filter { it.path.startsWith(":lib:") }.forEach { + api(it) + } + } + } } } diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index dd4a6f8..061d1cf 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -6,6 +6,9 @@ repositories { gradlePluginPortal() mavenCentral() google() + if (project.properties["project.useSnapshotRepositories"] == "true") { + maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/dev") + } } dependencies { @@ -14,4 +17,5 @@ dependencies { implementation("org.jetbrains.dokka:dokka-gradle-plugin:_") implementation("org.jetbrains.kotlin:kotlin-serialization:_") implementation("org.jlleitschuh.gradle:ktlint-gradle:_") + implementation("io.github.gradle-nexus:publish-plugin:_") } diff --git a/buildSrc/gradle.properties b/buildSrc/gradle.properties index 772fd9a..c1bcc89 100644 --- a/buildSrc/gradle.properties +++ b/buildSrc/gradle.properties @@ -1,9 +1,7 @@ -# The following property is required to mitigate issue https://github.com/gradle/gradle/issues/11412. -systemProp.org.gradle.internal.publish.checksums.insecure=true org.gradle.project.sourceCompatibility=11 +org.gradle.project.targetCompatibility=11 org.gradle.vfs.watch=true kotlin.style=official -kotlin.parallel.tasks.in.project=true kotlin.js.generate.externals=false kotlin.js.compiler=ir kotlin.incremental.js=true @@ -12,3 +10,6 @@ kotlin.mpp.stability.nowarn=true kotlin.mpp.enableGranularSourceSetsMetadata=true kotlin.native.enableDependencyPropagation=false kotlin.native.ignoreDisabledTargets=true + + +project.useSnapshotRepositories=true diff --git a/buildSrc/settings.gradle.kts b/buildSrc/settings.gradle.kts index 826bc88..e20ba09 100644 --- a/buildSrc/settings.gradle.kts +++ b/buildSrc/settings.gradle.kts @@ -1,8 +1,9 @@ -import de.fayard.refreshVersions.bootstrapRefreshVersionsForBuildSrc - -buildscript { - repositories { gradlePluginPortal() } - dependencies.classpath("de.fayard.refreshVersions:refreshVersions:0.9.7") +pluginManagement { + plugins { + id("de.fayard.refreshVersions") version "0.10.1" + } } -bootstrapRefreshVersionsForBuildSrc() +plugins { + id("de.fayard.refreshVersions") +} diff --git a/buildSrc/src/main/kotlin/convention.common.gradle.kts b/buildSrc/src/main/kotlin/convention.common.gradle.kts new file mode 100644 index 0000000..d2c1844 --- /dev/null +++ b/buildSrc/src/main/kotlin/convention.common.gradle.kts @@ -0,0 +1,25 @@ +plugins { + id("org.jlleitschuh.gradle.ktlint") + idea +} + +repositories { + mavenCentral() + google() + if (project.properties["project.useSnapshotRepositories"] == "true") { + maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/dev") + } +} + +idea { + module { + isDownloadSources = true + isDownloadJavadoc = true + } +} + +tasks { + withType { + useJUnitPlatform() + } +} \ No newline at end of file diff --git a/buildSrc/src/main/kotlin/convention.library.gradle.kts b/buildSrc/src/main/kotlin/convention.library.gradle.kts new file mode 100644 index 0000000..2902ab4 --- /dev/null +++ b/buildSrc/src/main/kotlin/convention.library.gradle.kts @@ -0,0 +1,113 @@ +import org.jetbrains.kotlin.gradle.tasks.KotlinCompile +import util.nativeTargetGroup + +plugins { + kotlin("multiplatform") + kotlin("plugin.serialization") + id("convention.common") +} + +kotlin { + explicitApi() + jvm() + js { + binaries.library() + useCommonJs() + nodejs() +// browser { +// commonWebpackConfig { +// cssSupport.enabled = true +// } +// testTask { +// useKarma { +// useFirefox() +// useChrome() +// useSafari() +// } +// } +// } + } + + nativeTargetGroup( + "androidNdk", + androidNativeArm32(), + androidNativeArm64(), + ) + + nativeTargetGroup( + "linux", + linuxX64(), + linuxMips32(), + linuxMipsel32(), + linuxArm64(), + linuxArm32Hfp(), + ) + + nativeTargetGroup( + "ios", + iosArm32(), + iosArm64(), + iosX64(), + ) + + nativeTargetGroup( + "watchos", + watchosArm32(), + watchosArm64(), + watchosX86(), + watchosX64(), + ) + + nativeTargetGroup( + "tvos", + tvosArm64(), + tvosX64(), + ) + + macosX64() + + nativeTargetGroup( + "mingw", + mingwX86(), + mingwX64(), + ) + + sourceSets { + commonTest { + dependencies { + implementation(project(":test")) + } + } + } + + val targetsWithCoroutines = listOf( + jvm(), + js(), + linuxX64(), + iosArm32(), + iosArm64(), + iosX64(), + watchosArm32(), + watchosArm64(), + watchosX86(), + tvosArm64(), + tvosX64(), + macosX64(), + mingwX64(), + ) + targetsWithCoroutines.forEach { + it.compilations["main"].defaultSourceSet { + dependencies { + api("org.jetbrains.kotlinx:kotlinx-coroutines-core:_") + } + } + } +} + +tasks { + withType { + kotlinOptions { + jvmTarget = project.properties["org.gradle.project.targetCompatibility"]!!.toString() + } + } +} diff --git a/buildSrc/src/main/kotlin/convention.publishing-nexus.gradle.kts b/buildSrc/src/main/kotlin/convention.publishing-nexus.gradle.kts new file mode 100644 index 0000000..6c847ef --- /dev/null +++ b/buildSrc/src/main/kotlin/convention.publishing-nexus.gradle.kts @@ -0,0 +1,13 @@ +plugins { + id("convention.publishing") + id("io.github.gradle-nexus.publish-plugin") +} + +nexusPublishing { + repositories { + sonatype { + nexusUrl.set(uri("https://s01.oss.sonatype.org/service/local/")) + snapshotRepositoryUrl.set(uri("https://s01.oss.sonatype.org/content/repositories/snapshots/")) + } + } +} \ No newline at end of file diff --git a/buildSrc/src/main/kotlin/convention.publishing.gradle.kts b/buildSrc/src/main/kotlin/convention.publishing.gradle.kts new file mode 100644 index 0000000..cfcea49 --- /dev/null +++ b/buildSrc/src/main/kotlin/convention.publishing.gradle.kts @@ -0,0 +1,174 @@ +import org.gradle.internal.os.OperatingSystem +import org.jetbrains.kotlin.gradle.dsl.KotlinCommonOptions +import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation +import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType +import org.jetbrains.kotlin.gradle.plugin.KotlinTarget +import org.jetbrains.kotlin.gradle.plugin.mpp.AbstractKotlinTarget +import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinAndroidTarget +import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget +import org.jetbrains.kotlin.gradle.targets.js.dsl.KotlinJsTargetDsl +import org.jetbrains.kotlin.gradle.targets.jvm.KotlinJvmTarget + +plugins { + id("convention.library") + id("org.jetbrains.dokka") + `maven-publish` + signing +} + +internal val currentOS = OperatingSystem.current() +internal val mainOS = OperatingSystem.forName(project.properties["project.mainOS"] as String) +internal val isMainOS = currentOS == mainOS + +logger.info( + """ + [OS Info] CurrentOS: $currentOS + [OS Info] MainOS: $mainOS + [OS Info] IsMainOS: $isMainOS + [OS Info] IsLinux: ${currentOS.isLinux} + [OS Info] IsMacOSX: ${currentOS.isMacOsX} + [OS Info] IsWindows: ${currentOS.isWindows} +""".trimIndent() +) + +tasks { + register("javadocJar") { + dependsOn(dokkaHtml) + archiveClassifier.set("javadoc") + from(dokkaHtml.get().outputDirectory) + } + withType { + manifest { + attributes += sortedMapOf( + "Built-By" to System.getProperty("user.name"), + "Build-Jdk" to System.getProperty("java.version"), + "Implementation-Version" to project.version, + "Created-By" to "${GradleVersion.current()}", + "Created-From" to Git.headCommitHash + ) + } + } +} + +signing { + val signingKey: String? by project + val signingPassword: String? by project + if (signingKey != null) { + useInMemoryPgpKeys(signingKey, signingPassword) + sign(publishing.publications) + } +} + +publishing { + publications { + repositories { + maven("https://maven.pkg.github.com/mpetuska/${project.name}") { + name = "GitHub" + credentials { + username = System.getenv("GH_USERNAME") + password = System.getenv("GH_PASSWORD") + } + } + } + val ghOwnerId: String = project.properties["gh.owner.id"]!!.toString() + val ghOwnerName: String = project.properties["gh.owner.name"]!!.toString() + val ghOwnerEmail: String = project.properties["gh.owner.email"]!!.toString() + withType { + artifact(tasks["javadocJar"]) + pom { + name by project.name + url by "https://github.com/$ghOwnerId/${project.name}" + description by rootProject.description + + licenses { + license { + name by "The Apache License, Version 2.0" + url by "https://www.apache.org/licenses/LICENSE-2.0.txt" + } + } + + developers { + developer { + id to ghOwnerId + name to ghOwnerName + email to ghOwnerEmail + } + } + + scm { + connection by "scm:git:git@github.com:$ghOwnerId/${project.name}.git" + url by "https://github.com/$ghOwnerId/${project.name}" + tag by Git.headCommitHash + } + } + } + } +} + +kotlin { + val nativeTargets = targets.filterIsInstance() + val androidNdkTargets = setOf( + "androidNativeArm32", + "androidNativeArm64", + ).run { nativeTargets.filter { it.preset?.name in this }.toSet() } + val linuxTargets = setOf( + "linuxArm32Hfp", + "linuxArm64", + "linuxMips32", + "linuxMipsel32", + "linuxX64", + ).run { nativeTargets.filter { it.preset?.name in this }.toSet() } + val iosTargets = setOf( + "iosArm32", + "iosArm64", + "iosX64", + ).run { nativeTargets.filter { it.preset?.name in this }.toSet() } + val watchosTargets = setOf( + "watchosX86", + "watchosX64", + "watchosArm64", + "watchosArm32", + ).run { nativeTargets.filter { it.preset?.name in this }.toSet() } + val tvosTargets = setOf( + "tvosArm64", + "tvosX64", + ).run { nativeTargets.filter { it.preset?.name in this }.toSet() } + val macosTargets = setOf( + "macosX64", + ).run { nativeTargets.filter { it.preset?.name in this }.toSet() } + val mingwTargets = setOf( + "mingwX64", + "mingwX86", + ).run { nativeTargets.filter { it.preset?.name in this }.toSet() } + val crossPlatformTargets = ( + targets.filterIsInstance() + + targets.filterIsInstance() + + targets.filterIsInstance() + ).toSet() + + val windowsHostTargets = mingwTargets + val linuxHostTargets = linuxTargets + androidNdkTargets + val osxHostTargets = iosTargets + watchosTargets + tvosTargets + macosTargets + val mainHostTargets = crossPlatformTargets + Named { "kotlinMultiplatform" } + + fun Collection.onlyPublishIf(enabled: Spec) { + val publications: Collection = map { it.name } + publishing { + publications { + matching { it.name in publications }.all { + val targetPublication = this@all + tasks.withType() + .matching { it.publication == targetPublication } + .configureEach { + onlyIf(enabled) + } + } + } + } + } + + linuxHostTargets.onlyPublishIf { currentOS.isLinux } + osxHostTargets.onlyPublishIf { currentOS.isMacOsX } + windowsHostTargets.onlyPublishIf { currentOS.isWindows } + mainHostTargets.onlyPublishIf { isMainOS } +} diff --git a/buildSrc/src/main/kotlin/util/gradle.kt b/buildSrc/src/main/kotlin/gradle.kt similarity index 98% rename from buildSrc/src/main/kotlin/util/gradle.kt rename to buildSrc/src/main/kotlin/gradle.kt index 7aa5897..1e3d4cc 100644 --- a/buildSrc/src/main/kotlin/util/gradle.kt +++ b/buildSrc/src/main/kotlin/gradle.kt @@ -1,5 +1,3 @@ -package util - import groovy.lang.Closure import org.gradle.api.provider.Property import java.nio.charset.Charset diff --git a/buildSrc/src/main/kotlin/local.common-conventions.gradle.kts b/buildSrc/src/main/kotlin/local.common-conventions.gradle.kts deleted file mode 100644 index bbaa233..0000000 --- a/buildSrc/src/main/kotlin/local.common-conventions.gradle.kts +++ /dev/null @@ -1,5 +0,0 @@ -repositories { - mavenCentral() - google() - jcenter() // Required for dokka -} diff --git a/buildSrc/src/main/kotlin/local.library-conventions.gradle.kts b/buildSrc/src/main/kotlin/local.library-conventions.gradle.kts deleted file mode 100644 index 495f8bc..0000000 --- a/buildSrc/src/main/kotlin/local.library-conventions.gradle.kts +++ /dev/null @@ -1,169 +0,0 @@ -import org.gradle.internal.os.OperatingSystem -import util.Git -import util.by -import util.nativeTargetGroup - -plugins { - id("local.common-conventions") - kotlin("multiplatform") - id("org.jetbrains.kotlin.plugin.serialization") - id("org.jetbrains.dokka") - id("org.jlleitschuh.gradle.ktlint") - `maven-publish` -} - -internal val currentOS = OperatingSystem.current() -internal val mainOS = OperatingSystem.forName(project.properties["project.mainOS"] as String) -internal val isMainOS = currentOS == mainOS - -logger.info( - """ - [OS Info] CurrentOS: $currentOS - [OS Info] MainOS: $mainOS - [OS Info] IsMainOS: $isMainOS - [OS Info] IsLinux: ${currentOS.isLinux} - [OS Info] IsMacOSX: ${currentOS.isMacOsX} - [OS Info] IsWindows: ${currentOS.isWindows} -""".trimIndent() -) - -kotlin { - explicitApi() - val mainHostTargets = setOf( - jvm(), - js { - binaries.library() - useCommonJs() - nodejs() -// browser { -// commonWebpackConfig { -// cssSupport.enabled = true -// } -// testTask { -// useKarma { -// useFirefox() -// useChrome() -// useSafari() -// } -// } -// } - } - ) - - val androidNdkTargets = nativeTargetGroup( - "androidNdk", - androidNativeArm32() to false, - androidNativeArm64() to false - ) - val linuxTargets = nativeTargetGroup( - "linux", - linuxX64() to true, - linuxMips32() to false, - linuxMipsel32() to false, - linuxArm64() to false, - linuxArm32Hfp() to false - ) - val iosTargets = nativeTargetGroup( - "ios", - iosArm32() to true, - iosArm64() to true, - iosX64() to true - ) - val watchosTargets = nativeTargetGroup( - "watchos", - watchosArm32() to true, - watchosArm64() to true, - watchosX86() to true, - watchosX64() to false - ) - val tvosTargets = nativeTargetGroup( - "tvos", - tvosArm64() to true, - tvosX64() to true - ) - val macosTargets = nativeTargetGroup( - "macos", - macosX64() to true - ) - //Commonizer does not yet work on [mingwX64, mingwX86] - val windowsHostTargets = nativeTargetGroup( - "windows", - mingwX86() to false - ) + nativeTargetGroup( - "windows", - mingwX64() to true, - ) - val linuxHostTargets = linuxTargets + androidNdkTargets - val osxHostTargets = iosTargets + watchosTargets + tvosTargets + macosTargets - val nativeTargets = linuxHostTargets + osxHostTargets + windowsHostTargets - - sourceSets { - commonTest { - dependencies { - implementation(project(":test")) - } - } - named("jvmMain") { - dependencies { - api("org.jetbrains.kotlinx:kotlinx-coroutines-core:_") - } - } - named("jsMain") { - dependencies { - api("org.jetbrains.kotlinx:kotlinx-coroutines-core:_") - } - } - } - - publishing { - publications { - withType { - pom { - name by project.name - url by "https://github.com/mpetuska/${rootProject.name}" - description by (project.description ?: rootProject.description) - - licenses { - license { - name by "The Apache License, Version 2.0" - url by "https://www.apache.org/licenses/LICENSE-2.0.txt" - } - } - - scm { - connection by "scm:git:git@github.com:mpetuska/${rootProject.name}.git" - url by "https://github.com/mpetuska/${rootProject.name}" - tag by Git.headCommitHash - } - } - } - } - repositories { - maven("GitHub") { - url = uri("https://maven.pkg.github.com/mpetuska/${rootProject.name}") - credentials { - username = System.getenv("GH_USERNAME") - password = System.getenv("GH_PASSWORD") - } - } - } - } - fun controlPublications(publications: Collection, enabled: Spec) { - publishing { - publications { - matching { it.name in publications }.all { - val targetPublication = this@all - tasks.withType() - .matching { it.publication == targetPublication } - .configureEach { - onlyIf(enabled) - } - } - } - } - } - controlPublications(linuxHostTargets.map { it.name }) { currentOS.isLinux } - controlPublications(osxHostTargets.map { it.name }) { currentOS.isMacOsX } - controlPublications(windowsHostTargets.map { it.name }) { currentOS.isWindows } - controlPublications(mainHostTargets.map { it.name } + "kotlinMultiplatform") { isMainOS } -} diff --git a/buildSrc/src/main/kotlin/util/nativeTargetGroup.kt b/buildSrc/src/main/kotlin/util/nativeTargetGroup.kt index e982960..283252c 100644 --- a/buildSrc/src/main/kotlin/util/nativeTargetGroup.kt +++ b/buildSrc/src/main/kotlin/util/nativeTargetGroup.kt @@ -7,42 +7,33 @@ import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget fun KotlinMultiplatformExtension.nativeTargetGroup( name: String, - vararg targets: Pair -): Set { - val groupTargets = targets.toMap() - - val allWithCoroutines = groupTargets.values.all { it } + vararg targets: KotlinNativeTarget +): Array { sourceSets { - val commonMain = getByName("commonMain") - val commonTest = getByName("commonTest") - val main = if (groupTargets.size > 1) { - create("${name}Main") { + val (main, test) = if (targets.size > 1) { + val commonMain = getByName("commonMain") + val commonTest = getByName("commonTest") + val main = create("${name}Main") { dependsOn(commonMain) - if (allWithCoroutines) { - dependencies { - api("org.jetbrains.kotlinx:kotlinx-coroutines-core:_") - } - } } - } else null - val test = if (groupTargets.size > 1) { - create("${name}Test") { + val test = create("${name}Test") { dependsOn(commonTest) } - } else null - groupTargets.entries.forEach { (target, hasCoroutines) -> - target.compilations["main"].defaultSourceSet { - main?.let { dependsOn(main) } - if (hasCoroutines) { - dependencies { - api("org.jetbrains.kotlinx:kotlinx-coroutines-core:_") - } + main to test + } else (null to null) + + targets.forEach { target -> + main?.let { + target.compilations["main"].defaultSourceSet { + dependsOn(main) } } - target.compilations["test"].defaultSourceSet { - test?.let { dependsOn(test) } + test?.let { + target.compilations["test"].defaultSourceSet { + dependsOn(test) + } } } } - return groupTargets.keys + return targets } diff --git a/gradle.properties b/gradle.properties index 3d55c49..f3f8070 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,9 +1,8 @@ -# The following property is required to mitigate issue https://github.com/gradle/gradle/issues/11412. -systemProp.org.gradle.internal.publish.checksums.insecure=true org.gradle.project.sourceCompatibility=11 +org.gradle.project.targetCompatibility=11 org.gradle.vfs.watch=true +org.gradle.jvmargs=-XX:MaxMetaspaceSize=2g -Xmx2g kotlin.style=official -kotlin.parallel.tasks.in.project=true kotlin.js.generate.externals=false kotlin.js.compiler=ir kotlin.incremental.js=true @@ -13,8 +12,15 @@ kotlin.mpp.enableGranularSourceSetsMetadata=true kotlin.native.enableDependencyPropagation=false kotlin.native.ignoreDisabledTargets=true + +project.useSnapshotRepositories=true # linux | osx | windows project.mainOS=linux -group=com.github.mpetuska -version=1.0.0 + +gh.owner.id=mpetuska +gh.owner.name=Martynas Petuska +gh.owner.email=martynas@petuska.dev + +group=dev.petuska description=Template for kotlin multiplatform library +version=0.0.0 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e708b1c023ec8b20f512888fe07c5bd3ff77bb8f..7454180f2ae8848c63b8b4dea2cb829da983f2fa 100644 GIT binary patch delta 18435 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 B8dv}T delta 17845 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 X49Luk)baa85H9$5YCsTPT`SVRWMtMW diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 76d741b..69a9715 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-rc-2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 4f906e0..744e882 100755 --- a/gradlew +++ b/gradlew @@ -72,7 +72,7 @@ case "`uname`" in Darwin* ) darwin=true ;; - MINGW* ) + MSYS* | MINGW* ) msys=true ;; NONSTOP* ) diff --git a/gradlew.bat b/gradlew.bat index 107acd3..ac1b06f 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,89 +1,89 @@ -@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%" == "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%"=="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 +@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%" == "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%"=="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/lib/template-kmp-library-core/build.gradle.kts b/lib/template-kmp-library-core/build.gradle.kts index 19a17bf..a5264ae 100644 --- a/lib/template-kmp-library-core/build.gradle.kts +++ b/lib/template-kmp-library-core/build.gradle.kts @@ -1,3 +1,3 @@ plugins { - id("local.library-conventions") + id("convention.publishing") } diff --git a/lib/template-kmp-library-core/src/androidNdkMain/kotlin/platform.kt b/lib/template-kmp-library-core/src/androidNdkMain/kotlin/platform.kt index 91144ab..ebc72df 100644 --- a/lib/template-kmp-library-core/src/androidNdkMain/kotlin/platform.kt +++ b/lib/template-kmp-library-core/src/androidNdkMain/kotlin/platform.kt @@ -1,3 +1,3 @@ -package com.github.mpetuska.template.kmp.library.core +package dev.petuska.template.kmp.library.core internal actual val platform: String = "Android NDK" diff --git a/lib/template-kmp-library-core/src/commonMain/kotlin/CoreLib.kt b/lib/template-kmp-library-core/src/commonMain/kotlin/CoreLib.kt index 00917b1..28e0165 100644 --- a/lib/template-kmp-library-core/src/commonMain/kotlin/CoreLib.kt +++ b/lib/template-kmp-library-core/src/commonMain/kotlin/CoreLib.kt @@ -1,4 +1,4 @@ -package com.github.mpetuska.template.kmp.library.core +package dev.petuska.template.kmp.library.core internal expect val platform: String diff --git a/lib/template-kmp-library-core/src/commonTest/kotlin/CoreLibTest.kt b/lib/template-kmp-library-core/src/commonTest/kotlin/CoreLibTest.kt index 52bb1d8..d111521 100644 --- a/lib/template-kmp-library-core/src/commonTest/kotlin/CoreLibTest.kt +++ b/lib/template-kmp-library-core/src/commonTest/kotlin/CoreLibTest.kt @@ -1,6 +1,6 @@ -package com.github.mpetuska.template.kmp.library.core +package dev.petuska.template.kmp.library.core -import com.github.mpetuska.template.kmp.library.test.runBlockingTest +import local.test.runBlockingTest import kotlin.test.Test import kotlin.test.assertEquals diff --git a/lib/template-kmp-library-core/src/iosMain/kotlin/platform.kt b/lib/template-kmp-library-core/src/iosMain/kotlin/platform.kt index 75189c5..1356e6a 100644 --- a/lib/template-kmp-library-core/src/iosMain/kotlin/platform.kt +++ b/lib/template-kmp-library-core/src/iosMain/kotlin/platform.kt @@ -1,3 +1,3 @@ -package com.github.mpetuska.template.kmp.library.core +package dev.petuska.template.kmp.library.core internal actual val platform: String = "iOS" diff --git a/lib/template-kmp-library-core/src/jsMain/kotlin/platform.kt b/lib/template-kmp-library-core/src/jsMain/kotlin/platform.kt index a7884fe..69f5368 100644 --- a/lib/template-kmp-library-core/src/jsMain/kotlin/platform.kt +++ b/lib/template-kmp-library-core/src/jsMain/kotlin/platform.kt @@ -1,3 +1,3 @@ -package com.github.mpetuska.template.kmp.library.core +package dev.petuska.template.kmp.library.core internal actual val platform: String = "JS" diff --git a/lib/template-kmp-library-core/src/jvmMain/kotlin/platform.kt b/lib/template-kmp-library-core/src/jvmMain/kotlin/platform.kt index e294e9d..f3d26b8 100644 --- a/lib/template-kmp-library-core/src/jvmMain/kotlin/platform.kt +++ b/lib/template-kmp-library-core/src/jvmMain/kotlin/platform.kt @@ -1,3 +1,3 @@ -package com.github.mpetuska.template.kmp.library.core +package dev.petuska.template.kmp.library.core internal actual val platform: String = "JVM" diff --git a/lib/template-kmp-library-core/src/linuxMain/kotlin/platform.kt b/lib/template-kmp-library-core/src/linuxMain/kotlin/platform.kt index 0d3b76d..8b79054 100644 --- a/lib/template-kmp-library-core/src/linuxMain/kotlin/platform.kt +++ b/lib/template-kmp-library-core/src/linuxMain/kotlin/platform.kt @@ -1,3 +1,3 @@ -package com.github.mpetuska.template.kmp.library.core +package dev.petuska.template.kmp.library.core internal actual val platform: String = "Linux" diff --git a/lib/template-kmp-library-core/src/macosX64Main/kotlin/platform.kt b/lib/template-kmp-library-core/src/macosX64Main/kotlin/platform.kt index f2d189e..5bd1f80 100644 --- a/lib/template-kmp-library-core/src/macosX64Main/kotlin/platform.kt +++ b/lib/template-kmp-library-core/src/macosX64Main/kotlin/platform.kt @@ -1,3 +1,3 @@ -package com.github.mpetuska.template.kmp.library.core +package dev.petuska.template.kmp.library.core internal actual val platform: String = "macOS" diff --git a/lib/template-kmp-library-core/src/mingwMain/kotlin/platform.kt b/lib/template-kmp-library-core/src/mingwMain/kotlin/platform.kt new file mode 100644 index 0000000..b1ca32c --- /dev/null +++ b/lib/template-kmp-library-core/src/mingwMain/kotlin/platform.kt @@ -0,0 +1,3 @@ +package dev.petuska.template.kmp.library.core + +internal actual val platform: String = "Windows" diff --git a/lib/template-kmp-library-core/src/mingwX64Main/kotlin/platform.kt b/lib/template-kmp-library-core/src/mingwX64Main/kotlin/platform.kt deleted file mode 100644 index 024cf2c..0000000 --- a/lib/template-kmp-library-core/src/mingwX64Main/kotlin/platform.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.github.mpetuska.template.kmp.library.core - -internal actual val platform: String = "Windows X64" diff --git a/lib/template-kmp-library-core/src/mingwX86Main/kotlin/platform.kt b/lib/template-kmp-library-core/src/mingwX86Main/kotlin/platform.kt deleted file mode 100644 index a920f6a..0000000 --- a/lib/template-kmp-library-core/src/mingwX86Main/kotlin/platform.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.github.mpetuska.template.kmp.library.core - -internal actual val platform: String = "Windows X86" diff --git a/lib/template-kmp-library-core/src/tvosMain/kotlin/platform.kt b/lib/template-kmp-library-core/src/tvosMain/kotlin/platform.kt index b30baa4..9c5dd21 100644 --- a/lib/template-kmp-library-core/src/tvosMain/kotlin/platform.kt +++ b/lib/template-kmp-library-core/src/tvosMain/kotlin/platform.kt @@ -1,3 +1,3 @@ -package com.github.mpetuska.template.kmp.library.core +package dev.petuska.template.kmp.library.core internal actual val platform: String = "tvOS" diff --git a/lib/template-kmp-library-core/src/watchosMain/kotlin/platform.kt b/lib/template-kmp-library-core/src/watchosMain/kotlin/platform.kt index 49dccae..7d48aac 100644 --- a/lib/template-kmp-library-core/src/watchosMain/kotlin/platform.kt +++ b/lib/template-kmp-library-core/src/watchosMain/kotlin/platform.kt @@ -1,3 +1,3 @@ -package com.github.mpetuska.template.kmp.library.core +package dev.petuska.template.kmp.library.core internal actual val platform: String = "watchOS" diff --git a/lib/template-kmp-library-dsl/build.gradle.kts b/lib/template-kmp-library-dsl/build.gradle.kts index 8b7e35a..9825f70 100644 --- a/lib/template-kmp-library-dsl/build.gradle.kts +++ b/lib/template-kmp-library-dsl/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - id("local.library-conventions") + id("convention.publishing") } kotlin { diff --git a/lib/template-kmp-library-dsl/src/androidNdkMain/kotlin/platform.kt b/lib/template-kmp-library-dsl/src/androidNdkMain/kotlin/platform.kt index 8748da5..bd5c228 100644 --- a/lib/template-kmp-library-dsl/src/androidNdkMain/kotlin/platform.kt +++ b/lib/template-kmp-library-dsl/src/androidNdkMain/kotlin/platform.kt @@ -1,3 +1,3 @@ -package com.github.mpetuska.template.kmp.library.dsl +package dev.petuska.template.kmp.library.dsl internal actual val platform: String = "Android NDK" diff --git a/lib/template-kmp-library-dsl/src/commonMain/kotlin/DslLib.kt b/lib/template-kmp-library-dsl/src/commonMain/kotlin/DslLib.kt index 207b1d7..74f0e1f 100644 --- a/lib/template-kmp-library-dsl/src/commonMain/kotlin/DslLib.kt +++ b/lib/template-kmp-library-dsl/src/commonMain/kotlin/DslLib.kt @@ -1,4 +1,4 @@ -package com.github.mpetuska.template.kmp.library.dsl +package dev.petuska.template.kmp.library.dsl internal expect val platform: String diff --git a/lib/template-kmp-library-dsl/src/commonTest/kotlin/DslLibTest.kt b/lib/template-kmp-library-dsl/src/commonTest/kotlin/DslLibTest.kt index 5750f3b..4d62933 100644 --- a/lib/template-kmp-library-dsl/src/commonTest/kotlin/DslLibTest.kt +++ b/lib/template-kmp-library-dsl/src/commonTest/kotlin/DslLibTest.kt @@ -1,6 +1,6 @@ -package com.github.mpetuska.template.kmp.library.dsl +package dev.petuska.template.kmp.library.dsl -import com.github.mpetuska.template.kmp.library.test.runBlockingTest +import local.test.runBlockingTest import kotlin.test.Test import kotlin.test.assertTrue diff --git a/lib/template-kmp-library-dsl/src/iosMain/kotlin/platform.kt b/lib/template-kmp-library-dsl/src/iosMain/kotlin/platform.kt index ccc9bf8..be958a6 100644 --- a/lib/template-kmp-library-dsl/src/iosMain/kotlin/platform.kt +++ b/lib/template-kmp-library-dsl/src/iosMain/kotlin/platform.kt @@ -1,3 +1,3 @@ -package com.github.mpetuska.template.kmp.library.dsl +package dev.petuska.template.kmp.library.dsl internal actual val platform: String = "iOS" diff --git a/lib/template-kmp-library-dsl/src/jsMain/kotlin/platform.kt b/lib/template-kmp-library-dsl/src/jsMain/kotlin/platform.kt index 267c0c6..5a59099 100644 --- a/lib/template-kmp-library-dsl/src/jsMain/kotlin/platform.kt +++ b/lib/template-kmp-library-dsl/src/jsMain/kotlin/platform.kt @@ -1,3 +1,3 @@ -package com.github.mpetuska.template.kmp.library.dsl +package dev.petuska.template.kmp.library.dsl internal actual val platform: String = "JS" diff --git a/lib/template-kmp-library-dsl/src/jvmMain/kotlin/platform.kt b/lib/template-kmp-library-dsl/src/jvmMain/kotlin/platform.kt index 82c2be4..68f492e 100644 --- a/lib/template-kmp-library-dsl/src/jvmMain/kotlin/platform.kt +++ b/lib/template-kmp-library-dsl/src/jvmMain/kotlin/platform.kt @@ -1,3 +1,3 @@ -package com.github.mpetuska.template.kmp.library.dsl +package dev.petuska.template.kmp.library.dsl internal actual val platform: String = "JVM" diff --git a/lib/template-kmp-library-dsl/src/linuxMain/kotlin/platform.kt b/lib/template-kmp-library-dsl/src/linuxMain/kotlin/platform.kt index 8c86505..9825c86 100644 --- a/lib/template-kmp-library-dsl/src/linuxMain/kotlin/platform.kt +++ b/lib/template-kmp-library-dsl/src/linuxMain/kotlin/platform.kt @@ -1,3 +1,3 @@ -package com.github.mpetuska.template.kmp.library.dsl +package dev.petuska.template.kmp.library.dsl internal actual val platform: String = "Linux" diff --git a/lib/template-kmp-library-dsl/src/macosX64Main/kotlin/platform.kt b/lib/template-kmp-library-dsl/src/macosX64Main/kotlin/platform.kt index 7ef583b..152aef0 100644 --- a/lib/template-kmp-library-dsl/src/macosX64Main/kotlin/platform.kt +++ b/lib/template-kmp-library-dsl/src/macosX64Main/kotlin/platform.kt @@ -1,3 +1,3 @@ -package com.github.mpetuska.template.kmp.library.dsl +package dev.petuska.template.kmp.library.dsl internal actual val platform: String = "macOS" diff --git a/lib/template-kmp-library-dsl/src/mingwMain/kotlin/platform.kt b/lib/template-kmp-library-dsl/src/mingwMain/kotlin/platform.kt new file mode 100644 index 0000000..309c455 --- /dev/null +++ b/lib/template-kmp-library-dsl/src/mingwMain/kotlin/platform.kt @@ -0,0 +1,3 @@ +package dev.petuska.template.kmp.library.dsl + +internal actual val platform: String = "Windows" diff --git a/lib/template-kmp-library-dsl/src/mingwX64Main/kotlin/platform.kt b/lib/template-kmp-library-dsl/src/mingwX64Main/kotlin/platform.kt deleted file mode 100644 index 739c7cb..0000000 --- a/lib/template-kmp-library-dsl/src/mingwX64Main/kotlin/platform.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.github.mpetuska.template.kmp.library.dsl - -internal actual val platform: String = "Windows X64" diff --git a/lib/template-kmp-library-dsl/src/mingwX86Main/kotlin/platform.kt b/lib/template-kmp-library-dsl/src/mingwX86Main/kotlin/platform.kt deleted file mode 100644 index e617286..0000000 --- a/lib/template-kmp-library-dsl/src/mingwX86Main/kotlin/platform.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.github.mpetuska.template.kmp.library.dsl - -internal actual val platform: String = "Windows X86" diff --git a/lib/template-kmp-library-dsl/src/tvosMain/kotlin/platform.kt b/lib/template-kmp-library-dsl/src/tvosMain/kotlin/platform.kt index c972dd5..01badda 100644 --- a/lib/template-kmp-library-dsl/src/tvosMain/kotlin/platform.kt +++ b/lib/template-kmp-library-dsl/src/tvosMain/kotlin/platform.kt @@ -1,3 +1,3 @@ -package com.github.mpetuska.template.kmp.library.dsl +package dev.petuska.template.kmp.library.dsl internal actual val platform: String = "tvOS" diff --git a/lib/template-kmp-library-dsl/src/watchosMain/kotlin/platform.kt b/lib/template-kmp-library-dsl/src/watchosMain/kotlin/platform.kt index 6383a3d..8f4e552 100644 --- a/lib/template-kmp-library-dsl/src/watchosMain/kotlin/platform.kt +++ b/lib/template-kmp-library-dsl/src/watchosMain/kotlin/platform.kt @@ -1,3 +1,3 @@ -package com.github.mpetuska.template.kmp.library.dsl +package dev.petuska.template.kmp.library.dsl internal actual val platform: String = "watchOS" diff --git a/sandbox/build.gradle.kts b/sandbox/build.gradle.kts index 5a8f568..84b0f96 100644 --- a/sandbox/build.gradle.kts +++ b/sandbox/build.gradle.kts @@ -1,16 +1,21 @@ plugins { - id("local.common-conventions") - kotlin("jvm") + kotlin("jvm") version "1.5.10" application } +repositories { + mavenCentral() + google() + maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/dev") +} + description = "Local consumer sandbox" application { - mainClass.set("com.github.mpetuska.template.kmp.library.sandbox.MainKt") + mainClass.set("local.sandbox.MainKt") } dependencies { - implementation(rootProject) - testImplementation(project(":test")) + implementation("dev.petuska:template-kmp-library") + testImplementation("dev.petuska:test") } diff --git a/sandbox/gradle b/sandbox/gradle new file mode 120000 index 0000000..3337596 --- /dev/null +++ b/sandbox/gradle @@ -0,0 +1 @@ +../gradle \ No newline at end of file diff --git a/sandbox/gradlew b/sandbox/gradlew new file mode 120000 index 0000000..502f5a2 --- /dev/null +++ b/sandbox/gradlew @@ -0,0 +1 @@ +../gradlew \ No newline at end of file diff --git a/sandbox/gradlew.bat b/sandbox/gradlew.bat new file mode 120000 index 0000000..2840132 --- /dev/null +++ b/sandbox/gradlew.bat @@ -0,0 +1 @@ +../gradlew.bat \ No newline at end of file diff --git a/sandbox/settings.gradle.kts b/sandbox/settings.gradle.kts new file mode 100644 index 0000000..ae5227e --- /dev/null +++ b/sandbox/settings.gradle.kts @@ -0,0 +1 @@ +includeBuild("..") \ No newline at end of file diff --git a/sandbox/src/main/kotlin/main.kt b/sandbox/src/main/kotlin/main.kt index dc499c8..38fdea7 100644 --- a/sandbox/src/main/kotlin/main.kt +++ b/sandbox/src/main/kotlin/main.kt @@ -1,8 +1,8 @@ -package com.github.mpetuska.template.kmp.library.sandbox +package local.sandbox -import com.github.mpetuska.template.kmp.library.core.CoreLib -import com.github.mpetuska.template.kmp.library.dsl.withPlatform -import com.github.mpetuska.template.kmp.library.dsl.withPlatformSuspend +import dev.petuska.template.kmp.library.core.CoreLib +import dev.petuska.template.kmp.library.dsl.withPlatform +import dev.petuska.template.kmp.library.dsl.withPlatformSuspend import kotlinx.coroutines.runBlocking fun main() { diff --git a/sandbox/src/test/kotlin/MainTest.kt b/sandbox/src/test/kotlin/MainTest.kt index b4ab080..3d612f3 100644 --- a/sandbox/src/test/kotlin/MainTest.kt +++ b/sandbox/src/test/kotlin/MainTest.kt @@ -1,6 +1,6 @@ -package com.github.mpetuska.template.kmp.library.sandbox +package local.sandbox -import com.github.mpetuska.template.kmp.library.test.runBlockingTest +import local.test.runBlockingTest import kotlinx.coroutines.delay import org.junit.Test @@ -9,6 +9,6 @@ class MainTest { fun test() = runBlockingTest { println(main()) delay(500) - println(suspendingMain()) + println("After Delay: ${suspendingMain()}") } } diff --git a/settings.gradle.kts b/settings.gradle.kts index 05943b9..922b632 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,17 +1,10 @@ -import de.fayard.refreshVersions.bootstrapRefreshVersions - -buildscript { - repositories { - gradlePluginPortal() - mavenCentral() - } - dependencies { classpath("de.fayard.refreshVersions:refreshVersions:0.9.7") } +plugins { + id("de.fayard.refreshVersions") version "0.10.1" + id("com.gradle.enterprise") version "3.6.3" } -bootstrapRefreshVersions() - rootProject.name = "template-kmp-library" -include(":sandbox", ":test") +include(":test") include( ":lib:template-kmp-library-core", ":lib:template-kmp-library-dsl" diff --git a/src/commonMain/kotlin/placeholder.kt b/src/commonMain/kotlin/placeholder.kt index 4d166b3..7e61819 100644 --- a/src/commonMain/kotlin/placeholder.kt +++ b/src/commonMain/kotlin/placeholder.kt @@ -1 +1 @@ -package com.github.mpetuska.template.kmp.library +package dev.petuska.template.kmp.library diff --git a/test/build.gradle.kts b/test/build.gradle.kts index d7e8107..089cb80 100644 --- a/test/build.gradle.kts +++ b/test/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - id("local.library-conventions") + id("convention.library") } description = "Local test utilities" @@ -25,7 +25,3 @@ kotlin { } } } -tasks { - withType().configureEach { onlyIf { false } } - withType().configureEach { onlyIf { false } } -} diff --git a/test/src/androidNdkMain/kotlin/runBlockingTest.kt b/test/src/androidNdkMain/kotlin/runBlockingTest.kt index 19b3e7e..1996947 100644 --- a/test/src/androidNdkMain/kotlin/runBlockingTest.kt +++ b/test/src/androidNdkMain/kotlin/runBlockingTest.kt @@ -1,4 +1,4 @@ -package com.github.mpetuska.template.kmp.library.test +package local.test actual interface CoroutineScope diff --git a/test/src/commonMain/kotlin/runBlockingTest.kt b/test/src/commonMain/kotlin/runBlockingTest.kt index 7d9d08e..5adfe1c 100644 --- a/test/src/commonMain/kotlin/runBlockingTest.kt +++ b/test/src/commonMain/kotlin/runBlockingTest.kt @@ -1,4 +1,4 @@ -package com.github.mpetuska.template.kmp.library.test +package local.test expect interface CoroutineScope diff --git a/test/src/iosMain/kotlin/runBlockingTest.kt b/test/src/iosMain/kotlin/runBlockingTest.kt index 8f7c3b5..bb685a9 100644 --- a/test/src/iosMain/kotlin/runBlockingTest.kt +++ b/test/src/iosMain/kotlin/runBlockingTest.kt @@ -1,4 +1,4 @@ -package com.github.mpetuska.template.kmp.library.test +package local.test import kotlinx.coroutines.runBlocking diff --git a/test/src/jsMain/kotlin/runBlockingTest.kt b/test/src/jsMain/kotlin/runBlockingTest.kt index 57a7a10..2c044e4 100644 --- a/test/src/jsMain/kotlin/runBlockingTest.kt +++ b/test/src/jsMain/kotlin/runBlockingTest.kt @@ -1,4 +1,4 @@ -package com.github.mpetuska.template.kmp.library.test +package local.test import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.promise diff --git a/test/src/jvmMain/kotlin/runBlockingTest.kt b/test/src/jvmMain/kotlin/runBlockingTest.kt index 8f7c3b5..bb685a9 100644 --- a/test/src/jvmMain/kotlin/runBlockingTest.kt +++ b/test/src/jvmMain/kotlin/runBlockingTest.kt @@ -1,4 +1,4 @@ -package com.github.mpetuska.template.kmp.library.test +package local.test import kotlinx.coroutines.runBlocking diff --git a/test/src/linuxArm32HfpMain/kotlin/runBlockingTest.kt b/test/src/linuxArm32HfpMain/kotlin/runBlockingTest.kt index 81ef50c..9a7697f 100644 --- a/test/src/linuxArm32HfpMain/kotlin/runBlockingTest.kt +++ b/test/src/linuxArm32HfpMain/kotlin/runBlockingTest.kt @@ -1,4 +1,4 @@ -package com.github.mpetuska.template.kmp.library.test +package local.test actual interface CoroutineScope diff --git a/test/src/linuxArm64Main/kotlin/runBlockingTest.kt b/test/src/linuxArm64Main/kotlin/runBlockingTest.kt index 66a46f4..c5e7c2b 100644 --- a/test/src/linuxArm64Main/kotlin/runBlockingTest.kt +++ b/test/src/linuxArm64Main/kotlin/runBlockingTest.kt @@ -1,4 +1,4 @@ -package com.github.mpetuska.template.kmp.library.test +package local.test actual interface CoroutineScope diff --git a/test/src/linuxMips32Main/kotlin/runBlockingTest.kt b/test/src/linuxMips32Main/kotlin/runBlockingTest.kt index 936047d..d457cc9 100644 --- a/test/src/linuxMips32Main/kotlin/runBlockingTest.kt +++ b/test/src/linuxMips32Main/kotlin/runBlockingTest.kt @@ -1,4 +1,4 @@ -package com.github.mpetuska.template.kmp.library.test +package local.test actual interface CoroutineScope diff --git a/test/src/linuxMipsel32Main/kotlin/runBlockingTest.kt b/test/src/linuxMipsel32Main/kotlin/runBlockingTest.kt index 45be03a..d66dd92 100644 --- a/test/src/linuxMipsel32Main/kotlin/runBlockingTest.kt +++ b/test/src/linuxMipsel32Main/kotlin/runBlockingTest.kt @@ -1,4 +1,4 @@ -package com.github.mpetuska.template.kmp.library.test +package local.test actual interface CoroutineScope diff --git a/test/src/linuxX64Main/kotlin/runBlockingTest.kt b/test/src/linuxX64Main/kotlin/runBlockingTest.kt index 8f7c3b5..bb685a9 100644 --- a/test/src/linuxX64Main/kotlin/runBlockingTest.kt +++ b/test/src/linuxX64Main/kotlin/runBlockingTest.kt @@ -1,4 +1,4 @@ -package com.github.mpetuska.template.kmp.library.test +package local.test import kotlinx.coroutines.runBlocking diff --git a/test/src/macosX64Main/kotlin/runBlockingTest.kt b/test/src/macosX64Main/kotlin/runBlockingTest.kt index 8f7c3b5..bb685a9 100644 --- a/test/src/macosX64Main/kotlin/runBlockingTest.kt +++ b/test/src/macosX64Main/kotlin/runBlockingTest.kt @@ -1,4 +1,4 @@ -package com.github.mpetuska.template.kmp.library.test +package local.test import kotlinx.coroutines.runBlocking diff --git a/test/src/mingwX64Main/kotlin/runBlockingTest.kt b/test/src/mingwX64Main/kotlin/runBlockingTest.kt index 8f7c3b5..bb685a9 100644 --- a/test/src/mingwX64Main/kotlin/runBlockingTest.kt +++ b/test/src/mingwX64Main/kotlin/runBlockingTest.kt @@ -1,4 +1,4 @@ -package com.github.mpetuska.template.kmp.library.test +package local.test import kotlinx.coroutines.runBlocking diff --git a/test/src/mingwX86Main/kotlin/runBlockingTest.kt b/test/src/mingwX86Main/kotlin/runBlockingTest.kt index d491937..2b8f6ce 100644 --- a/test/src/mingwX86Main/kotlin/runBlockingTest.kt +++ b/test/src/mingwX86Main/kotlin/runBlockingTest.kt @@ -1,4 +1,4 @@ -package com.github.mpetuska.template.kmp.library.test +package local.test actual interface CoroutineScope diff --git a/test/src/tvosMain/kotlin/runBlockingTest.kt b/test/src/tvosMain/kotlin/runBlockingTest.kt index 73bfa17..879804c 100644 --- a/test/src/tvosMain/kotlin/runBlockingTest.kt +++ b/test/src/tvosMain/kotlin/runBlockingTest.kt @@ -1,4 +1,4 @@ -package com.github.mpetuska.template.kmp.library.test +package local.test import kotlinx.coroutines.runBlocking actual typealias CoroutineScope = kotlinx.coroutines.CoroutineScope diff --git a/test/src/watchosArm32Main/kotlin/runBlockingTest.kt b/test/src/watchosArm32Main/kotlin/runBlockingTest.kt index 8f7c3b5..bb685a9 100644 --- a/test/src/watchosArm32Main/kotlin/runBlockingTest.kt +++ b/test/src/watchosArm32Main/kotlin/runBlockingTest.kt @@ -1,4 +1,4 @@ -package com.github.mpetuska.template.kmp.library.test +package local.test import kotlinx.coroutines.runBlocking diff --git a/test/src/watchosArm64Main/kotlin/runBlockingTest.kt b/test/src/watchosArm64Main/kotlin/runBlockingTest.kt index 8f7c3b5..bb685a9 100644 --- a/test/src/watchosArm64Main/kotlin/runBlockingTest.kt +++ b/test/src/watchosArm64Main/kotlin/runBlockingTest.kt @@ -1,4 +1,4 @@ -package com.github.mpetuska.template.kmp.library.test +package local.test import kotlinx.coroutines.runBlocking diff --git a/test/src/watchosX64Main/kotlin/runBlockingTest.kt b/test/src/watchosX64Main/kotlin/runBlockingTest.kt index 5019b4d..7fcc3df 100644 --- a/test/src/watchosX64Main/kotlin/runBlockingTest.kt +++ b/test/src/watchosX64Main/kotlin/runBlockingTest.kt @@ -1,4 +1,4 @@ -package com.github.mpetuska.template.kmp.library.test +package local.test actual interface CoroutineScope diff --git a/test/src/watchosX86Main/kotlin/runBlockingTest.kt b/test/src/watchosX86Main/kotlin/runBlockingTest.kt index 8f7c3b5..bb685a9 100644 --- a/test/src/watchosX86Main/kotlin/runBlockingTest.kt +++ b/test/src/watchosX86Main/kotlin/runBlockingTest.kt @@ -1,4 +1,4 @@ -package com.github.mpetuska.template.kmp.library.test +package local.test import kotlinx.coroutines.runBlocking diff --git a/versions.properties b/versions.properties index 0d51367..b578581 100644 --- a/versions.properties +++ b/versions.properties @@ -1,33 +1,22 @@ -## suppress inspection "SpellCheckingInspection" for whole file -## suppress inspection "UnusedProperty" for whole file -## -## Dependencies and Plugin versions with their available updates -## Generated by $ ./gradlew refreshVersions -## Please, don't put extra comments in that file yet, keeping them is not supported yet. +#### Dependencies and Plugin versions with their available updates. +#### Generated by `./gradlew refreshVersions` version 0.10.1 +#### +#### Don't manually edit or split the comments that start with four hashtags (####), +#### they will be overwritten by refreshVersions. +#### +#### suppress inspection "SpellCheckingInspection" for whole file +#### suppress inspection "UnusedProperty" for whole file -plugin.android=4.2.0-beta06 -## # available=7.0.0-alpha01 -## # available=7.0.0-alpha02 -## # available=7.0.0-alpha03 -## # available=7.0.0-alpha04 -## # available=7.0.0-alpha05 -## # available=7.0.0-alpha06 -## # available=7.0.0-alpha07 -## # available=7.0.0-alpha08 -## # available=7.0.0-alpha09 -## # available=7.0.0-alpha10 -## # available=7.0.0-alpha11 -## # available=7.0.0-alpha12 -## # available=7.0.0-alpha13 +plugin.android=7.0.0-beta04 plugin.com.github.jakemarsden.git-hooks=0.0.2 -version.kotlin=1.4.32 -## # available=1.5.0-M1 -## # available=1.5.0-M2 +version.io.github.gradle-nexus..publish-plugin=1.1.0 -version.kotlinx.coroutines=1.4.3 +version.kotlin=1.5.30-dev-2423 -version.org.jetbrains.dokka..dokka-gradle-plugin=1.4.30 +version.kotlinx.coroutines=1.5.0 -version.org.jlleitschuh.gradle..ktlint-gradle=10.0.0 +version.org.jetbrains.dokka..dokka-gradle-plugin=1.4.32 + +version.org.jlleitschuh.gradle..ktlint-gradle=10.1.0