Skip to content

Commit

Permalink
Updated Kotlin to 1.9.20
Browse files Browse the repository at this point in the history
  • Loading branch information
arkivanov committed Nov 7, 2023
1 parent 14f37af commit 77be0a8
Show file tree
Hide file tree
Showing 12 changed files with 6 additions and 63 deletions.
Original file line number Diff line number Diff line change
@@ -1,14 +1,9 @@
package com.arkivanov.essenty.backhandler

import com.arkivanov.essenty.backhandler.BackDispatcher.PredictiveBackDispatcher
import com.arkivanov.essenty.utils.internal.ensureNeverFrozen

internal class DefaultBackDispatcher : BackDispatcher {

init {
ensureNeverFrozen()
}

private var set = emptySet<BackCallback>()
override val isEnabled: Boolean get() = set.any(BackCallback::isEnabled)

Expand Down
8 changes: 4 additions & 4 deletions deps.versions.toml
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
[versions]

essenty = "1.3.0-alpha03"
kotlin = "1.9.0"
kotlin = "1.9.20"
kotlinxBinaryCompatibilityValidator = "0.13.2"
detektGradlePlugin = "1.22.0"
detektGradlePlugin = "1.23.3"
junit = "4.13.2"
androidGradle = "8.0.2"
androidxCore = "1.6.0"
androidxLifecycle = "2.2.0"
androidxSavedstate = "1.1.0"
androidxActivity = "1.8.0-rc01"
androidxActivity = "1.8.0"
jetbrainsKotlinxSerialization = "1.6.0"
robolectric = "4.9.1"
parcelizeDarwin = "0.2.1"
parcelizeDarwin = "0.2.3"

[libraries]

Expand Down
1 change: 1 addition & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ systemProp.org.gradle.internal.publish.checksums.insecure=true
android.useAndroidX=true
android.enableJetifier=true
kotlin.mpp.androidSourceSetLayoutVersion=2
kotlin.mpp.applyDefaultHierarchyTemplate=false

# For compatibility with Kotlin 1.9.0
android.experimental.lint.version=8.1.0
Original file line number Diff line number Diff line change
@@ -1,14 +1,9 @@
package com.arkivanov.essenty.instancekeeper

import com.arkivanov.essenty.instancekeeper.InstanceKeeper.Instance
import com.arkivanov.essenty.utils.internal.ensureNeverFrozen

internal class DefaultInstanceKeeperDispatcher : InstanceKeeperDispatcher {

init {
ensureNeverFrozen()
}

private val map = HashMap<Any, Instance>()
private var isDestroyed = false

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,9 @@ package com.arkivanov.essenty.lifecycle

import com.arkivanov.essenty.lifecycle.Lifecycle.Callbacks
import com.arkivanov.essenty.lifecycle.Lifecycle.State
import com.arkivanov.essenty.utils.internal.ensureNeverFrozen

internal class LifecycleRegistryImpl(initialState: State) : LifecycleRegistry {

init {
ensureNeverFrozen()
}

private var callbacks = emptySet<Callbacks>()
private var _state = initialState
override val state: State get() = _state
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,9 @@
package com.arkivanov.essenty.parcelable

import com.arkivanov.essenty.utils.internal.ensureNeverFrozen
import kotlin.reflect.KClass

internal class SimpleParcelableContainer : ParcelableContainer {

init {
ensureNeverFrozen()
}

private var value: Parcelable? = null

@Suppress("UNCHECKED_CAST")
Expand Down
2 changes: 1 addition & 1 deletion settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ pluginManagement {
resolutionStrategy {
eachPlugin {
if (requested.id.toString() == "com.arkivanov.gradle.setup") {
useModule("com.github.arkivanov:gradle-setup-plugin:2571f348ff")
useModule("com.github.arkivanov:gradle-setup-plugin:655aedff78")
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import com.arkivanov.essenty.parcelable.Parcelable
import com.arkivanov.essenty.parcelable.ParcelableContainer
import com.arkivanov.essenty.parcelable.Parcelize
import com.arkivanov.essenty.parcelable.consume
import com.arkivanov.essenty.utils.internal.ensureNeverFrozen
import kotlin.reflect.KClass

internal class DefaultStateKeeperDispatcher internal constructor(
Expand All @@ -17,10 +16,6 @@ internal class DefaultStateKeeperDispatcher internal constructor(
parcelableContainerFactory = { ParcelableContainer(it) } // Lambda because of https://youtrack.jetbrains.com/issue/KT-49186
)

init {
ensureNeverFrozen()
}

private val savedState: MutableMap<String, ParcelableContainer>? = savedState?.consume<SavedState>()?.map
private val suppliers = HashMap<String, () -> Parcelable?>()

Expand Down
15 changes: 0 additions & 15 deletions utils-internal/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
import com.arkivanov.gradle.bundle
import com.arkivanov.gradle.dependsOn
import com.arkivanov.gradle.setupMultiplatform
import com.arkivanov.gradle.setupPublication
import com.arkivanov.gradle.setupSourceSets

plugins {
id("kotlin-multiplatform")
Expand All @@ -16,15 +13,3 @@ setupPublication()
android {
namespace = "com.arkivanov.essenty.utils.internal"
}

kotlin {
setupSourceSets {
val native by bundle()
val nonNative by bundle()

native dependsOn common
nonNative dependsOn common
nativeSet dependsOn native
(allSet - nativeSet) dependsOn nonNative
}
}

This file was deleted.

This file was deleted.

This file was deleted.

0 comments on commit 77be0a8

Please sign in to comment.