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

Fix Kotlin Metadata unique_name value so that it is actually unique #539

Merged
merged 6 commits into from
Aug 30, 2024
Merged

Fix Kotlin Metadata unique_name value so that it is actually unique #539

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f3617c8
Fix Kotlin Metadata unique_name value so that it is actually unique
05nelsonm Aug 28, 2024
d8bec49
Throw exception when whitespace and/or new lines
05nelsonm Aug 28, 2024
a1a2e61
Move snippet to root build.gradle.kts file
05nelsonm Aug 29, 2024
64ce9c1
Migrate metadata fix to plugin
05nelsonm Aug 29, 2024
cdb72da
Update kmp-configuration plugin with all the fixes
05nelsonm Aug 30, 2024
64984ef
Bump kmp-configuration plugin to fix .kotlin_module file name
05nelsonm Aug 30, 2024
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
4 changes: 4 additions & 0 deletions build-logic/src/main/kotlin/-KmpConfigurationExtension.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@ fun KmpConfigurationExtension.configureShared(
action: Action<KmpConfigurationContainerDsl>
) {
configure {
options {
useUniqueModuleNames = true
}

if (androidNamespace != null) {
androidLibrary(namespace = androidNamespace) {
if (publish) target { publishLibraryVariants("release") }
Expand Down
4 changes: 2 additions & 2 deletions build-logic/src/main/kotlin/dokka.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
**/
import org.jetbrains.dokka.DokkaConfiguration.Visibility
import org.jetbrains.dokka.gradle.DokkaTaskPartial
import java.net.URL
import java.net.URI

plugins {
id("org.jetbrains.dokka")
Expand All @@ -32,7 +32,7 @@ tasks.withType<DokkaTaskPartial>().configureEach {
dokkaSourceSets.configureEach {
sourceLink {
localDirectory = rootDir
remoteUrl = URL("https://github.com/05nelsonm/kmp-tor/tree/master")
remoteUrl = URI("https://github.com/05nelsonm/kmp-tor/tree/master").toURL()
remoteLineSuffix = "#L"
}
}
Expand Down
2 changes: 1 addition & 1 deletion build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ import org.jetbrains.kotlin.gradle.targets.js.yarn.YarnPlugin
import org.jetbrains.kotlin.gradle.targets.js.yarn.YarnRootExtension

plugins {
alias(libs.plugins.kotlin.multiplatform) apply(false)
alias(libs.plugins.android.app) apply(false)
alias(libs.plugins.android.library) apply(false)
alias(libs.plugins.binary.compat)
alias(libs.plugins.dokka)
alias(libs.plugins.kotlin.multiplatform) apply(false)
}

allprojects {
Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ encoding = "2.2.1"
gradle-android = "8.2.2"
gradle-binary-compat = "0.14.0"
gradle-dokka = "1.9.20"
gradle-kmp-configuration = "0.2.2"
gradle-kmp-configuration = "0.3.2"
gradle-kotlin = "1.9.24"
gradle-publish-maven = "0.28.0"

Expand Down
4 changes: 2 additions & 2 deletions library/runtime-core/api/runtime-core.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4262,14 +4262,14 @@ public final class io/matthewnelson/kmp/tor/runtime/core/net/LocalHost$Companion

public final class io/matthewnelson/kmp/tor/runtime/core/net/LocalHost$IPv4 : io/matthewnelson/kmp/tor/runtime/core/net/LocalHost {
public static final field INSTANCE Lio/matthewnelson/kmp/tor/runtime/core/net/LocalHost$IPv4;
public synthetic fun fromCache$runtime_core ()Lio/matthewnelson/kmp/tor/runtime/core/net/IPAddress;
public synthetic fun fromCache$io_matthewnelson_kmp_tor_runtime_core_jvm ()Lio/matthewnelson/kmp/tor/runtime/core/net/IPAddress;
public fun resolve ()Lio/matthewnelson/kmp/tor/runtime/core/net/IPAddress$V4;
public synthetic fun resolve ()Lio/matthewnelson/kmp/tor/runtime/core/net/IPAddress;
}

public final class io/matthewnelson/kmp/tor/runtime/core/net/LocalHost$IPv6 : io/matthewnelson/kmp/tor/runtime/core/net/LocalHost {
public static final field INSTANCE Lio/matthewnelson/kmp/tor/runtime/core/net/LocalHost$IPv6;
public synthetic fun fromCache$runtime_core ()Lio/matthewnelson/kmp/tor/runtime/core/net/IPAddress;
public synthetic fun fromCache$io_matthewnelson_kmp_tor_runtime_core_jvm ()Lio/matthewnelson/kmp/tor/runtime/core/net/IPAddress;
public fun resolve ()Lio/matthewnelson/kmp/tor/runtime/core/net/IPAddress$V6;
public synthetic fun resolve ()Lio/matthewnelson/kmp/tor/runtime/core/net/IPAddress;
}
Expand Down
4 changes: 4 additions & 0 deletions library/runtime-service-ui/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@ plugins {

kmpConfiguration {
configure {
options {
useUniqueModuleNames = true
}

androidLibrary(namespace = "io.matthewnelson.kmp.tor.runtime.service.ui") {
target { publishLibraryVariants("release") }

Expand Down
4 changes: 4 additions & 0 deletions library/runtime-service/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@ plugins {

kmpConfiguration {
configure {
options {
useUniqueModuleNames = true
}

androidLibrary(namespace = "io.matthewnelson.kmp.tor.runtime.service") {
target { publishLibraryVariants("release") }

Expand Down
Loading