diff --git a/build.gradle.kts b/build.gradle.kts index c98ec42..60e7a8d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -10,7 +10,7 @@ allprojects { } group = "com.mohamedrejeb.ksoup" - version = "0.2.1" + version = "0.3.0" apply(plugin = "maven-publish") apply(plugin = "signing") diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index ce9b7bb..94a89ff 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] -kotlin = "1.9.0" -kotlinx-kover = "0.7.1" +kotlin = "1.9.21" +kotlinx-kover = "0.7.4" [plugins] multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 8f5ef1a..2bbac7d 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists \ No newline at end of file diff --git a/ksoup-entites/build.gradle.kts b/ksoup-entites/build.gradle.kts deleted file mode 100644 index 50387b5..0000000 --- a/ksoup-entites/build.gradle.kts +++ /dev/null @@ -1,90 +0,0 @@ -plugins { - kotlin("multiplatform") -} - -kotlin { - explicitApi() - - jvm { - jvmToolchain(11) - } - js(IR) { - browser() - nodejs() - } - iosX64() - iosArm64() - iosSimulatorArm64() - tvosX64() - tvosArm64() - tvosSimulatorArm64() - watchosX64() - watchosArm64() - watchosSimulatorArm64() - linuxX64() - macosX64() - macosArm64() - mingwX64() - - sourceSets { - /* Main source sets */ - val commonMain by getting { - dependencies { - // The library is lightweight, we don't use any other dependencies :D - } - } - val nativeMain by creating - val jvmMain by getting - val jsMain by getting - val iosMain by creating - val tvosMain by creating - val watchosMain by creating - val linuxMain by creating - val macosMain by creating - val windowsMain by creating - val iosX64Main by getting - val iosArm64Main by getting - val iosSimulatorArm64Main by getting - val tvosX64Main by getting - val tvosArm64Main by getting - val tvosSimulatorArm64Main by getting - val watchosX64Main by getting - val watchosArm64Main by getting - val watchosSimulatorArm64Main by getting - val linuxX64Main by getting - val macosX64Main by getting - val macosArm64Main by getting - val mingwX64Main by getting - - /* Main hierarchy */ - nativeMain.dependsOn(commonMain) - jvmMain.dependsOn(commonMain) - jsMain.dependsOn(commonMain) - iosMain.dependsOn(nativeMain) - iosX64Main.dependsOn(iosMain) - iosArm64Main.dependsOn(iosMain) - iosSimulatorArm64Main.dependsOn(iosMain) - tvosMain.dependsOn(nativeMain) - tvosX64Main.dependsOn(tvosMain) - tvosArm64Main.dependsOn(tvosMain) - tvosSimulatorArm64Main.dependsOn(tvosMain) - watchosMain.dependsOn(nativeMain) - watchosX64Main.dependsOn(watchosMain) - watchosArm64Main.dependsOn(watchosMain) - watchosSimulatorArm64Main.dependsOn(watchosMain) - linuxMain.dependsOn(nativeMain) - linuxX64Main.dependsOn(linuxMain) - macosMain.dependsOn(nativeMain) - macosX64Main.dependsOn(macosMain) - macosArm64Main.dependsOn(macosMain) - windowsMain.dependsOn(nativeMain) - mingwX64Main.dependsOn(windowsMain) - - /* Test source sets */ - val commonTest by getting { - dependencies { - implementation(kotlin("test")) - } - } - } -} diff --git a/ksoup-entities/build.gradle.kts b/ksoup-entities/build.gradle.kts new file mode 100644 index 0000000..dfe8b86 --- /dev/null +++ b/ksoup-entities/build.gradle.kts @@ -0,0 +1,45 @@ +plugins { + kotlin("multiplatform") +} + +kotlin { + applyDefaultHierarchyTemplate() + explicitApi() + + jvm { + jvmToolchain(11) + } + js(IR) { + browser() + nodejs() + } + iosX64() + iosArm64() + iosSimulatorArm64() + tvosX64() + tvosArm64() + tvosSimulatorArm64() + watchosX64() + watchosArm64() + watchosSimulatorArm64() + linuxX64() + macosX64() + macosArm64() + mingwX64() + + sourceSets { + /* Main source sets */ + val commonMain by getting { + dependencies { + // The library is lightweight, we don't use any other dependencies :D + } + } + + /* Test source sets */ + val commonTest by getting { + dependencies { + implementation(kotlin("test")) + } + } + } +} diff --git a/ksoup-entites/src/commonMain/kotlin/com/mohamedrejeb/ksoup/entities/AggregateTranslator.kt b/ksoup-entities/src/commonMain/kotlin/com/mohamedrejeb/ksoup/entities/AggregateTranslator.kt similarity index 100% rename from ksoup-entites/src/commonMain/kotlin/com/mohamedrejeb/ksoup/entities/AggregateTranslator.kt rename to ksoup-entities/src/commonMain/kotlin/com/mohamedrejeb/ksoup/entities/AggregateTranslator.kt diff --git a/ksoup-entites/src/commonMain/kotlin/com/mohamedrejeb/ksoup/entities/EntityMaps.kt b/ksoup-entities/src/commonMain/kotlin/com/mohamedrejeb/ksoup/entities/EntityMaps.kt similarity index 100% rename from ksoup-entites/src/commonMain/kotlin/com/mohamedrejeb/ksoup/entities/EntityMaps.kt rename to ksoup-entities/src/commonMain/kotlin/com/mohamedrejeb/ksoup/entities/EntityMaps.kt diff --git a/ksoup-entites/src/commonMain/kotlin/com/mohamedrejeb/ksoup/entities/KsoupEntities.kt b/ksoup-entities/src/commonMain/kotlin/com/mohamedrejeb/ksoup/entities/KsoupEntities.kt similarity index 100% rename from ksoup-entites/src/commonMain/kotlin/com/mohamedrejeb/ksoup/entities/KsoupEntities.kt rename to ksoup-entities/src/commonMain/kotlin/com/mohamedrejeb/ksoup/entities/KsoupEntities.kt diff --git a/ksoup-entites/src/commonMain/kotlin/com/mohamedrejeb/ksoup/entities/LookupTranslator.kt b/ksoup-entities/src/commonMain/kotlin/com/mohamedrejeb/ksoup/entities/LookupTranslator.kt similarity index 100% rename from ksoup-entites/src/commonMain/kotlin/com/mohamedrejeb/ksoup/entities/LookupTranslator.kt rename to ksoup-entities/src/commonMain/kotlin/com/mohamedrejeb/ksoup/entities/LookupTranslator.kt diff --git a/ksoup-entites/src/commonMain/kotlin/com/mohamedrejeb/ksoup/entities/StringTranslator.kt b/ksoup-entities/src/commonMain/kotlin/com/mohamedrejeb/ksoup/entities/StringTranslator.kt similarity index 100% rename from ksoup-entites/src/commonMain/kotlin/com/mohamedrejeb/ksoup/entities/StringTranslator.kt rename to ksoup-entities/src/commonMain/kotlin/com/mohamedrejeb/ksoup/entities/StringTranslator.kt diff --git a/ksoup-entites/src/commonMain/kotlin/com/mohamedrejeb/ksoup/entities/text/translate/CodePointTranslator.kt b/ksoup-entities/src/commonMain/kotlin/com/mohamedrejeb/ksoup/entities/text/translate/CodePointTranslator.kt similarity index 100% rename from ksoup-entites/src/commonMain/kotlin/com/mohamedrejeb/ksoup/entities/text/translate/CodePointTranslator.kt rename to ksoup-entities/src/commonMain/kotlin/com/mohamedrejeb/ksoup/entities/text/translate/CodePointTranslator.kt diff --git a/ksoup-entites/src/commonMain/kotlin/com/mohamedrejeb/ksoup/entities/text/translate/NumericEntityDecoder.kt b/ksoup-entities/src/commonMain/kotlin/com/mohamedrejeb/ksoup/entities/text/translate/NumericEntityDecoder.kt similarity index 100% rename from ksoup-entites/src/commonMain/kotlin/com/mohamedrejeb/ksoup/entities/text/translate/NumericEntityDecoder.kt rename to ksoup-entities/src/commonMain/kotlin/com/mohamedrejeb/ksoup/entities/text/translate/NumericEntityDecoder.kt diff --git a/ksoup-entites/src/commonMain/kotlin/com/mohamedrejeb/ksoup/entities/text/translate/NumericEntityEncoder.kt b/ksoup-entities/src/commonMain/kotlin/com/mohamedrejeb/ksoup/entities/text/translate/NumericEntityEncoder.kt similarity index 100% rename from ksoup-entites/src/commonMain/kotlin/com/mohamedrejeb/ksoup/entities/text/translate/NumericEntityEncoder.kt rename to ksoup-entities/src/commonMain/kotlin/com/mohamedrejeb/ksoup/entities/text/translate/NumericEntityEncoder.kt diff --git a/ksoup-entites/src/commonMain/kotlin/com/mohamedrejeb/ksoup/entities/text/translate/UnicodeUnpairedSurrogateRemover.kt b/ksoup-entities/src/commonMain/kotlin/com/mohamedrejeb/ksoup/entities/text/translate/UnicodeUnpairedSurrogateRemover.kt similarity index 100% rename from ksoup-entites/src/commonMain/kotlin/com/mohamedrejeb/ksoup/entities/text/translate/UnicodeUnpairedSurrogateRemover.kt rename to ksoup-entities/src/commonMain/kotlin/com/mohamedrejeb/ksoup/entities/text/translate/UnicodeUnpairedSurrogateRemover.kt diff --git a/ksoup-entites/src/commonMain/kotlin/com/mohamedrejeb/ksoup/entities/utils/CharsUtils.kt b/ksoup-entities/src/commonMain/kotlin/com/mohamedrejeb/ksoup/entities/utils/CharsUtils.kt similarity index 100% rename from ksoup-entites/src/commonMain/kotlin/com/mohamedrejeb/ksoup/entities/utils/CharsUtils.kt rename to ksoup-entities/src/commonMain/kotlin/com/mohamedrejeb/ksoup/entities/utils/CharsUtils.kt diff --git a/ksoup-entites/src/commonTest/kotlin/com/mohamedrejeb/ksoup/KsoupEntitesTest.kt b/ksoup-entities/src/commonTest/kotlin/com/mohamedrejeb/ksoup/KsoupEntitiesTest.kt similarity index 99% rename from ksoup-entites/src/commonTest/kotlin/com/mohamedrejeb/ksoup/KsoupEntitesTest.kt rename to ksoup-entities/src/commonTest/kotlin/com/mohamedrejeb/ksoup/KsoupEntitiesTest.kt index 0b6dbef..7b618d1 100644 --- a/ksoup-entites/src/commonTest/kotlin/com/mohamedrejeb/ksoup/KsoupEntitesTest.kt +++ b/ksoup-entities/src/commonTest/kotlin/com/mohamedrejeb/ksoup/KsoupEntitiesTest.kt @@ -4,7 +4,7 @@ import com.mohamedrejeb.ksoup.entities.KsoupEntities import kotlin.test.Test import kotlin.test.assertEquals -class KsoupEntitesTest { +class KsoupEntitiesTest { fun testDecodeHtml5(input: String, expectedOutput: String) { val decoded = KsoupEntities.decodeHtml5(input) diff --git a/ksoup-html/build.gradle.kts b/ksoup-html/build.gradle.kts index fe00697..ef5706c 100644 --- a/ksoup-html/build.gradle.kts +++ b/ksoup-html/build.gradle.kts @@ -3,6 +3,8 @@ plugins { } kotlin { + applyDefaultHierarchyTemplate() + explicitApi() jvm { @@ -31,58 +33,10 @@ kotlin { /* Main source sets */ val commonMain by getting { dependencies { - implementation(project(":ksoup-entites")) + implementation(project(":ksoup-entities")) // The library is lightweight, we don't use any other dependencies :D } } - val nativeMain by creating - val jvmMain by getting - val jsMain by getting - val iosMain by creating - val tvosMain by creating - val watchosMain by creating - val linuxMain by creating - val macosMain by creating - val windowsMain by creating - val iosX64Main by getting - val iosArm64Main by getting - val iosSimulatorArm64Main by getting - val tvosX64Main by getting - val tvosArm64Main by getting - val tvosSimulatorArm64Main by getting - val watchosX64Main by getting - val watchosArm64Main by getting - val watchosSimulatorArm64Main by getting - val linuxX64Main by getting - val linuxArm64Main by getting - val macosX64Main by getting - val macosArm64Main by getting - val mingwX64Main by getting - - /* Main hierarchy */ - nativeMain.dependsOn(commonMain) - jvmMain.dependsOn(commonMain) - jsMain.dependsOn(commonMain) - iosMain.dependsOn(nativeMain) - iosX64Main.dependsOn(iosMain) - iosArm64Main.dependsOn(iosMain) - iosSimulatorArm64Main.dependsOn(iosMain) - tvosMain.dependsOn(nativeMain) - tvosX64Main.dependsOn(tvosMain) - tvosArm64Main.dependsOn(tvosMain) - tvosSimulatorArm64Main.dependsOn(tvosMain) - watchosMain.dependsOn(nativeMain) - watchosX64Main.dependsOn(watchosMain) - watchosArm64Main.dependsOn(watchosMain) - watchosSimulatorArm64Main.dependsOn(watchosMain) - linuxMain.dependsOn(nativeMain) - linuxX64Main.dependsOn(linuxMain) - linuxArm64Main.dependsOn(linuxMain) - macosMain.dependsOn(nativeMain) - macosX64Main.dependsOn(macosMain) - macosArm64Main.dependsOn(macosMain) - windowsMain.dependsOn(nativeMain) - mingwX64Main.dependsOn(windowsMain) /* Test source sets */ val commonTest by getting { diff --git a/settings.gradle.kts b/settings.gradle.kts index b49f8d5..8718730 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -17,5 +17,5 @@ dependencyResolutionManagement { include( ":ksoup-html", - ":ksoup-entites", + ":ksoup-entities", ) \ No newline at end of file