Skip to content

Commit 115bec2

Browse files
committed
Merge remote-tracking branch 'origin/main'
# Conflicts: # composeApp/src/commonMain/kotlin/ThirdPage.kt
2 parents 6a17351 + 9a98700 commit 115bec2

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

.github/workflows/test.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@ jobs:
1414
strategy:
1515
matrix:
1616
include:
17-
- target: iosSimulatorArm64Test
17+
- target: ':miuix:iosSimulatorArm64Test'
1818
os: macos-latest
19-
- target: desktopTest
19+
- target: ':miuix:desktopTest'
2020
os: ubuntu-latest
21-
- target: assembleAndroidTest
21+
- target: ':miuix:assembleAndroidTest'
2222
os: ubuntu-latest
23-
- target: testDebugUnitTest
23+
- target: ':miuix:testDebugUnitTest'
2424
os: ubuntu-latest
25-
- target: testReleaseUnitTest
25+
- target: ':miuix:testReleaseUnitTest'
2626
os: ubuntu-latest
2727
runs-on: ${{ matrix.os }}
2828

composeApp/build.gradle.kts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import com.android.build.gradle.internal.api.BaseVariantOutputImpl
44
import org.jetbrains.compose.desktop.application.dsl.TargetFormat
55
import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
66
import org.jetbrains.kotlin.gradle.plugin.mpp.apple.XCFramework
7+
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
78
import java.io.ByteArrayOutputStream
89
import java.util.Properties
910

@@ -200,7 +201,7 @@ val generateVersionInfo by tasks.registering {
200201
}
201202
}
202203

203-
tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
204+
tasks.withType<KotlinCompile>().configureEach {
204205
dependsOn(generateVersionInfo)
205206
}
206207

composeApp/src/commonMain/kotlin/ThirdPage.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ import androidx.compose.runtime.Composable
55
import androidx.compose.runtime.MutableState
66
import androidx.compose.ui.Modifier
77
import androidx.compose.ui.unit.dp
8-
import utils.VersionInfo
98
import top.yukonga.miuix.kmp.basic.Card
109
import top.yukonga.miuix.kmp.basic.LazyColumn
1110
import top.yukonga.miuix.kmp.basic.ScrollBehavior
1211
import top.yukonga.miuix.kmp.basic.SmallTitle
1312
import top.yukonga.miuix.kmp.extra.SuperDropdown
1413
import top.yukonga.miuix.kmp.extra.SuperSwitch
1514
import top.yukonga.miuix.kmp.utils.getWindowSize
15+
import utils.VersionInfo
1616

1717
@Composable
1818
fun ThirdPage(

0 commit comments

Comments
 (0)