Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: arkivanov/Decompose
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0.7.0-native-compose-01
Choose a base ref
...
head repository: arkivanov/Decompose
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0.7.0-native-compose-02
Choose a head ref
  • 3 commits
  • 8 files changed
  • 1 contributor

Commits on Jul 14, 2022

  1. Updated Kotlin to 1.7.0, Compose to 1.2.0-alpha01-dev741, Essenty to … 

    …0.4.2, AGP to 7.2.0, Gradle to 7.4.2
    @arkivanov
    arkivanov committed Jul 14, 2022
    Copy the full SHA
    bbaeeda View commit details

  2. Merge pull request #141 from arkivanov/update-kotlin-to-1.7.0 

    [compose-darwin] Update Kotlin to 1.7.0
    @arkivanov
    arkivanov authored Jul 14, 2022

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    1b8c1a2 View commit details

  3. Bumped version to 0.7.0-native-compose-02

    @arkivanov
    arkivanov committed Jul 14, 2022
    Copy the full SHA
    76e2118 View commit details
10 changes: 6 additions & 4 deletions build.gradle.kts
View file
Original file line number Diff line number Diff line change
@@ -69,9 +69,11 @@ allprojects {
google()
maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
}
}

// Workaround for https://youtrack.jetbrains.com/issue/KT-49109 until Kotlin 1.6.20
plugins.withType<org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin> {
the<org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension>().nodeVersion = "16.0.0"
afterEvaluate {
// Workaround for https://youtrack.jetbrains.com/issue/KT-52776
rootProject.extensions.findByType<org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension>()?.apply {
versions.webpackCli.version = "4.10.0"
}
}
}
2 changes: 2 additions & 0 deletions ...se/src/commonTest/kotlin/com/arkivanov/decompose/statekeeper/TestStateKeeperDispatcher.kt
View file
Original file line number Diff line number Diff line change
@@ -39,6 +39,8 @@ class TestStateKeeperDispatcher(
suppliers -= key
}

override fun isRegistered(key: String): Boolean = key in suppliers

fun assertSupplierRegistered(key: String) {
assertTrue(key in suppliers)
}
10 changes: 5 additions & 5 deletions deps.versions.toml
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
[versions]

decompose = "0.7.0-native-compose-01"
kotlin = "1.6.21"
essenty = "0.2.2"
decompose = "0.7.0-native-compose-02"
kotlin = "1.7.0"
essenty = "0.4.2"
reaktive = "1.2.1"
junit = "4.13.2"
jetbrainsCompose = "1.2.0-alpha01-dev716"
jetbrainsCompose = "1.2.0-alpha01-dev745"
jetbrainsKotlinWrappers = "0.0.1-pre.325-kotlin-1.6.10"
jetbrainsKotlinxCoroutines = "1.6.1"
jetbrainsBinaryCompatibilityValidator = "0.10.0"
androidGradle = "7.1.0"
androidGradle = "7.2.0"
androidMaterial = "1.3.0"
androidPlay = "1.10.0"
androidxCore = "1.3.2"
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading