Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
/kotlin-js-store/

.DS_Store
/captures
/local.properties
Expand Down
71 changes: 37 additions & 34 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,38 +1,40 @@
import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension

buildscript {
ext.kotlin_version = '1.3.72'
ext.atomicfu_version = '0.14.2'
ext.kotlin_version = '1.9.22'
ext.atomicfu_version = '0.23.2'

repositories {
mavenCentral()
jcenter()
}
dependencies {
classpath "org.jetbrains.kotlinx:atomicfu-gradle-plugin:$atomicfu_version"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath "org.jetbrains.kotlinx:atomicfu-gradle-plugin:$atomicfu_version"
}
}

repositories {
mavenCentral()
}

group GROUP
version VERSION_NAME

apply plugin: "org.jetbrains.kotlin.multiplatform"
apply plugin: "kotlinx-atomicfu"

repositories {
mavenCentral()
}


kotlin {
jvm("jvm6")
jvm("jvm8")

applyDefaultHierarchyTemplate()
jvm()
js {
browser {
}
nodejs {
}
}
wasmJs {
nodejs
}
// For ARM, should be changed to iosArm32 or iosArm64
// For Linux, should be changed to e.g. linuxX64
// For MacOS, should be changed to e.g. macosX64
Expand All @@ -46,7 +48,7 @@ kotlin {
kotlin.srcDir('src/main/')
dependencies {
implementation kotlin('stdlib-common')
implementation "org.jetbrains.kotlinx:atomicfu-common:$atomicfu_version"
api "org.jetbrains.kotlinx:atomicfu:$atomicfu_version"
}
}
commonTest {
Expand All @@ -56,51 +58,52 @@ kotlin {
implementation kotlin('test-annotations-common')
}
}

jvm6Main {
dependencies {
implementation kotlin('stdlib')
implementation kotlin('test-annotations-common')
}

}
jvm6Test {
dependencies {
implementation kotlin('test')
implementation kotlin('test-junit')
}
}

jvm8Main {
jvmMain {
task {
kotlinOption.jvmTarget = JavaVersion.VERSION_1_8
}

dependencies {
implementation kotlin('stdlib-jdk8')
implementation kotlin('test-annotations-common')
compileOnly kotlin('stdlib-jdk8')
compileOnly kotlin('test-annotations-common')
}
}

jvm8Test {
jvmTest {
dependencies {
implementation kotlin('test')
implementation kotlin('test-junit')
}
}
jsMain {
dependencies {
implementation kotlin('stdlib-js') }
compileOnly kotlin('stdlib-js') }
}
jsTest {
dependencies {
implementation kotlin('test-js')
}
}
wasmJs {
sourceSets.commonMain
dependencies {
compileOnly kotlin('stdlib-wasm-js')
}
}
wasmJsTest {
dependencies {
implementation kotlin('test-wasm-js')
}
}
macosMain {
}
macosTest {
}

}
}

extensions.findByType(NodeJsRootExtension.class).with {
// canary nodejs that supports recent Wasm GC changes
it.nodeVersion = '21.0.0-v8-canary202309167e82ab1fa2'
it.nodeDownloadBaseUrl = 'https://nodejs.org/download/v8-canary'
}
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.3.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip
1 change: 1 addition & 0 deletions src/test/kotlin/com/tinder/StateMachineTest.kt
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ internal class StateMachineTest {
SideEffect.LogFrozen -> logger.log(ON_FROZEN_MESSAGE)
SideEffect.LogVaporized -> logger.log(ON_VAPORIZED_MESSAGE)
SideEffect.LogCondensed -> logger.log(ON_CONDENSED_MESSAGE)
else -> logger.log("Unknown SideEffect")
}
}
}
Expand Down