Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WIP: Upgrade Kotlin / KSP / Compose Multiplatform #548

Closed
wants to merge 11 commits into from
Closed

WIP: Upgrade Kotlin / KSP / Compose Multiplatform #548

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
8ef7db5
Merge branch '2.x' of github.com:manuel-martos/appyx into 2.x
mmartosdev Jul 27, 2023
78e5f1c
Upgrade dependencies
mmartosdev Jul 27, 2023
c00b889
Update lint and detekt baselines + upgrade yarn.lock
mmartosdev Jul 28, 2023
703c244
Merge branch '2.x' of github.com:manuel-martos/appyx into 2.x
mmartosdev Jul 31, 2023
9c2f407
Merge branch '2.x' of github.com:manuel-martos/appyx into 2.x
mmartosdev Sep 20, 2023
2225b0b
Merge branch '2.x' into upgrade-kotlin-ksp-compose
mmartosdev Sep 20, 2023
3dfc0ca
Upgrade KSP to latest version
mmartosdev Sep 20, 2023
a7e76ad
Rollback lint and detekt baseline changes + upgrade compose plugin
mmartosdev Sep 20, 2023
e5ba6e6
Upgrade compose compiler
mmartosdev Sep 20, 2023
7f0a06f
Upgrade compose plugin
mmartosdev Sep 20, 2023
08a042d
Upgrade Android Compile SDK
mmartosdev Sep 20, 2023
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: 1 addition & 1 deletion appyx-components/experimental/modal/common/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ kotlin {
implementation(kotlin("test"))
}
}
val androidTest by getting {
val androidUnitTest by getting {
dependencies {
implementation(libs.junit)
}
Expand Down
2 changes: 1 addition & 1 deletion appyx-components/stable/spotlight/common/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ kotlin {
implementation(kotlin("test"))
}
}
val androidTest by getting {
val androidUnitTest by getting {
dependencies {
implementation(libs.junit)
}
Expand Down
2 changes: 1 addition & 1 deletion appyx-interactions/common/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ kotlin {
api(libs.androidx.core)
}
}
val androidTest by getting {
val androidUnitTest by getting {
dependencies {
implementation(libs.junit)
}
Expand Down
6 changes: 1 addition & 5 deletions .../src/commonMain/kotlin/com/bumble/appyx/interactions/core/modifiers/OnPointerEventNode.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package com.bumble.appyx.interactions.core.modifiers

import androidx.compose.ui.ExperimentalComposeUiApi
import androidx.compose.ui.Modifier
import androidx.compose.ui.input.pointer.PointerEvent
import androidx.compose.ui.input.pointer.PointerEventPass
Expand All @@ -9,7 +8,6 @@ import androidx.compose.ui.node.PointerInputModifierNode
import androidx.compose.ui.platform.InspectorInfo
import androidx.compose.ui.unit.IntSize

@OptIn(ExperimentalComposeUiApi::class)
class OnPointerEventNode(var callback: (PointerEvent) -> Unit) :
PointerInputModifierNode, Modifier.Node() {
override fun onPointerEvent(
Expand All @@ -29,14 +27,12 @@ class OnPointerEventNode(var callback: (PointerEvent) -> Unit) :
}
}

@OptIn(ExperimentalComposeUiApi::class)
data class PointerInputElement(
val callback: (PointerEvent) -> Unit
) : ModifierNodeElement<OnPointerEventNode>() {
override fun create() = OnPointerEventNode(callback)
override fun update(node: OnPointerEventNode): OnPointerEventNode {
override fun update(node: OnPointerEventNode) {
node.callback = callback
return node
}

override fun InspectorInfo.inspectableProperties() {
Expand Down
2 changes: 1 addition & 1 deletion demos/common/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ kotlin {
implementation(libs.coil.compose)
}
}
val androidTest by getting {
val androidUnitTest by getting {
dependencies {
implementation(libs.junit)
}
Expand Down
8 changes: 4 additions & 4 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@ androidTargetSdk = "32"
androidx-lifecycle = "2.6.1"
androidx-navigation-compose = "2.5.1"
coil = "2.2.1"
composePlugin = "1.4.0"
composePlugin = "1.5.0"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

but we can't update it without updating google compose to 1.5? And compose update at the main project is currently blocked

composeBom = "2023.05.01"
composeCompiler = "1.4.4"
composeCompiler = "1.5.2"
coroutines = "1.6.4"
dependencyAnalysis = "1.13.1"
detekt = "1.21.0"
junit5 = "5.8.2"
jvmTarget = "11"
kotlin = "1.8.10"
ksp = "1.8.0-1.0.8"
kotlin = "1.9.0"
ksp = "1.9.0-1.0.13"
mvicore = "1.2.6"
ribs = "0.39.0"
serialization-json = "1.5.0"
Expand Down
Loading