Skip to content

Commit

Permalink
Merge branch 'feature/GH-57-ksp' into feature/objc-swift-refined
Browse files Browse the repository at this point in the history
  • Loading branch information
rickclephas committed Aug 29, 2022
2 parents 7b9ca6e + a2e6aea commit fa747e4
Show file tree
Hide file tree
Showing 60 changed files with 2,201 additions and 1,146 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/run-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
matrix:
os: [ macos-12 ]
java: [ 11 ]
module: [ core ]
module: [ core, ksp ]
name: ${{ format('{0} ({1}, JDK {2})', matrix.module, matrix.os, matrix.java) }}
runs-on: ${{ matrix.os }}
steps:
Expand All @@ -41,7 +41,7 @@ jobs:
- name: Run tests
env:
GRADLE_MODULE: ${{ format(':kmp-nativecoroutines-{0}', matrix.module) }}
run: ./gradlew $GRADLE_MODULE:allTests
run: ./gradlew $GRADLE_MODULE:check
run-swift-tests:
if: github.event_name != 'pull_request' || github.event.pull_request.draft == false
strategy:
Expand Down
6 changes: 6 additions & 0 deletions .idea/kotlinc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

23 changes: 23 additions & 0 deletions .idea/runConfigurations/Core_Tests.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

23 changes: 23 additions & 0 deletions .idea/runConfigurations/KSP_Tests.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 10 additions & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,15 +1,23 @@
[versions]
kotlin = "1.8.0-dev-2466"
kotlinx-coroutines = "1.6.3"
ksp = "1.7.10-1.0.6"
kotlinpoet = "1.12.0"

[libraries]
kotlin-compiler = { module = "org.jetbrains.kotlin:kotlin-compiler", version.ref = "kotlin" }
kotlin-compiler-embeddable = { module = "org.jetbrains.kotlin:kotlin-compiler-embeddable", version.ref = "kotlin" }
kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" }
kotlinx-atomicfu = { module = "org.jetbrains.kotlinx:atomicfu", version = "0.17.1" }
kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinx-coroutines" }
ksp-api = { module = "com.google.devtools.ksp:symbol-processing-api", version.ref = "ksp" }
kotlinpoet = { module = "com.squareup:kotlinpoet", version.ref = "kotlinpoet" }
kotlinpoet-ksp = { module = "com.squareup:kotlinpoet-ksp", version.ref = "kotlinpoet" }

# Testing libraries
kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" }
kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "kotlinx-coroutines" }
kotlinCompileTesting-ksp = { module = "com.github.tschuchortdev:kotlin-compile-testing-ksp", version = "1.4.9" }

# Sample libraries
kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version = "1.3.1" }
Expand All @@ -21,3 +29,4 @@ kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref

# Sample plugins
kotlin-plugin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
package com.rickclephas.kmp.nativecoroutines

/**
* Identifies properties and functions that require a native coroutines version.
*/
@Target(AnnotationTarget.PROPERTY, AnnotationTarget.FUNCTION)
@Retention(AnnotationRetention.SOURCE)
@MustBeDocumented
annotation class NativeCoroutines

This file was deleted.

This file was deleted.

0 comments on commit fa747e4

Please sign in to comment.