From 6c1d8d5011f2273a14ff5a6448c8fa93ef93fe31 Mon Sep 17 00:00:00 2001 From: Ahmad Ansori Palembani Date: Sun, 15 Dec 2024 21:19:28 +0700 Subject: [PATCH] revert "refactor: Some multiplatform bs" --- CHANGELOG.md | 1 - core/build.gradle.kts | 1 - .../kotlin/yokai/core/archive/ArchiveEntry.kt | 0 .../kotlin/yokai/core/archive/ArchiveInputStream.kt | 2 +- .../src/androidMain/kotlin/yokai/core/archive/ArchiveReader.kt | 2 +- .../commonMain/kotlin/yokai/core/archive/ArchiveInputStream.kt | 3 --- core/src/commonMain/kotlin/yokai/core/archive/ArchiveReader.kt | 3 --- .../iosMain/kotlin/yokai/core/archive/ArchiveInputStream.kt | 3 --- core/src/iosMain/kotlin/yokai/core/archive/ArchiveReader.kt | 3 --- gradle/libs.versions.toml | 2 +- 10 files changed, 3 insertions(+), 17 deletions(-) rename core/src/{commonMain => androidMain}/kotlin/yokai/core/archive/ArchiveEntry.kt (100%) delete mode 100644 core/src/commonMain/kotlin/yokai/core/archive/ArchiveInputStream.kt delete mode 100644 core/src/commonMain/kotlin/yokai/core/archive/ArchiveReader.kt delete mode 100644 core/src/iosMain/kotlin/yokai/core/archive/ArchiveInputStream.kt delete mode 100644 core/src/iosMain/kotlin/yokai/core/archive/ArchiveReader.kt diff --git a/CHANGELOG.md b/CHANGELOG.md index b37fa9cf3f..fc4b2a579a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,7 +16,6 @@ The format is simplified version of [Keep a Changelog](https://keepachangelog.co - Update plugin kotlinter to v5 - Update plugin gradle-versions to v0.51.0 - Update kotlin monorepo to v2.1.0 -- Downgrade dependency me.zhanghai.android.libarchive:library to v1.1.2 ## [1.9.4] diff --git a/core/build.gradle.kts b/core/build.gradle.kts index 937662ecbe..ddac21ff77 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -66,7 +66,6 @@ android { tasks { withType { compilerOptions.freeCompilerArgs.addAll( - "-Xexpect-actual-classes", "-Xcontext-receivers", "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi", "-opt-in=kotlinx.serialization.ExperimentalSerializationApi", diff --git a/core/src/commonMain/kotlin/yokai/core/archive/ArchiveEntry.kt b/core/src/androidMain/kotlin/yokai/core/archive/ArchiveEntry.kt similarity index 100% rename from core/src/commonMain/kotlin/yokai/core/archive/ArchiveEntry.kt rename to core/src/androidMain/kotlin/yokai/core/archive/ArchiveEntry.kt diff --git a/core/src/androidMain/kotlin/yokai/core/archive/ArchiveInputStream.kt b/core/src/androidMain/kotlin/yokai/core/archive/ArchiveInputStream.kt index c805145fed..1da5acfe4a 100644 --- a/core/src/androidMain/kotlin/yokai/core/archive/ArchiveInputStream.kt +++ b/core/src/androidMain/kotlin/yokai/core/archive/ArchiveInputStream.kt @@ -3,6 +3,6 @@ package yokai.core.archive import java.io.InputStream // TODO: Use Okio's Source -actual abstract class ArchiveInputStream : InputStream() { +abstract class ArchiveInputStream : InputStream() { abstract fun getNextEntry(): ArchiveEntry? } diff --git a/core/src/androidMain/kotlin/yokai/core/archive/ArchiveReader.kt b/core/src/androidMain/kotlin/yokai/core/archive/ArchiveReader.kt index 8b7e1462bc..0eb3669d49 100644 --- a/core/src/androidMain/kotlin/yokai/core/archive/ArchiveReader.kt +++ b/core/src/androidMain/kotlin/yokai/core/archive/ArchiveReader.kt @@ -3,7 +3,7 @@ package yokai.core.archive import java.io.Closeable import java.io.InputStream -actual abstract class ArchiveReader : Closeable { +abstract class ArchiveReader : Closeable { abstract val address: Long abstract val size: Long diff --git a/core/src/commonMain/kotlin/yokai/core/archive/ArchiveInputStream.kt b/core/src/commonMain/kotlin/yokai/core/archive/ArchiveInputStream.kt deleted file mode 100644 index c4a5ff540e..0000000000 --- a/core/src/commonMain/kotlin/yokai/core/archive/ArchiveInputStream.kt +++ /dev/null @@ -1,3 +0,0 @@ -package yokai.core.archive - -expect abstract class ArchiveInputStream diff --git a/core/src/commonMain/kotlin/yokai/core/archive/ArchiveReader.kt b/core/src/commonMain/kotlin/yokai/core/archive/ArchiveReader.kt deleted file mode 100644 index 111e11def4..0000000000 --- a/core/src/commonMain/kotlin/yokai/core/archive/ArchiveReader.kt +++ /dev/null @@ -1,3 +0,0 @@ -package yokai.core.archive - -expect abstract class ArchiveReader diff --git a/core/src/iosMain/kotlin/yokai/core/archive/ArchiveInputStream.kt b/core/src/iosMain/kotlin/yokai/core/archive/ArchiveInputStream.kt deleted file mode 100644 index 9d85374f50..0000000000 --- a/core/src/iosMain/kotlin/yokai/core/archive/ArchiveInputStream.kt +++ /dev/null @@ -1,3 +0,0 @@ -package yokai.core.archive - -actual abstract class ArchiveInputStream diff --git a/core/src/iosMain/kotlin/yokai/core/archive/ArchiveReader.kt b/core/src/iosMain/kotlin/yokai/core/archive/ArchiveReader.kt deleted file mode 100644 index b06f6c26d8..0000000000 --- a/core/src/iosMain/kotlin/yokai/core/archive/ArchiveReader.kt +++ /dev/null @@ -1,3 +0,0 @@ -package yokai.core.archive - -actual abstract class ArchiveReader diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 0f38e62902..7d3fc9ec4e 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -54,7 +54,7 @@ kotest-assertions = { module = "io.kotest:kotest-assertions-core", version = "5. leakcanary-android = { module = "com.squareup.leakcanary:leakcanary-android", version.ref = "leakcanary" } leakcanary-plumber = { module = "com.squareup.leakcanary:plumber-android", version.ref = "leakcanary" } -libarchive = { module = "me.zhanghai.android.libarchive:library", version = "1.1.2" } +libarchive = { module = "me.zhanghai.android.libarchive:library", version = "1.1.4" } material = { module = "com.google.android.material:material", version = "1.12.0" } markwon = { module = "io.noties.markwon:core", version = "4.6.2" }