Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
40 changes: 0 additions & 40 deletions apollo/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -21,20 +21,6 @@ val currentModuleName = "Apollo"
val appleBinaryName = "ApolloLibrary"
val minimumIosVersion = "15.0"
val minimumMacOSVersion = "13.0"
val generatedResourcesDir =
project(":bip32-ed25519")
.layout
.buildDirectory
.asFile
.get()
.resolve("generatedResources")
val generatedJvmLibsDirs =
listOf(
generatedResourcesDir.resolve("jvmMain/libs/darwin-aarch64"),
generatedResourcesDir.resolve("jvmMain/libs/linux-aarch64"),
generatedResourcesDir.resolve("jvmMain/libs/darwin-x86-64"),
generatedResourcesDir.resolve("jvmMain/libs/linux-x86-64")
)

kotlin {
jvm {
Expand All @@ -44,15 +30,6 @@ kotlin {
jvmTarget.set(JvmTarget.JVM_17)
}
}

testRuns["test"].executionTask.configure {
useJUnitPlatform()
systemProperty(
"jna.library.path",
generatedJvmLibsDirs.joinToString(File.pathSeparator) { it.absolutePath }
)
jvmArgs("-Djava.library.path=${generatedJvmLibsDirs.joinToString(File.pathSeparator) { it.absolutePath }}")
}
}

androidTarget {
Expand Down Expand Up @@ -155,13 +132,6 @@ kotlin {

val jvmMain by getting {
dependsOn(commonMain)
resources
.srcDir(
project(":bip32-ed25519")
.layout
.buildDirectory
.dir("generatedResources/jvmMain/libs")
)
dependencies {
api(libs.secp256k1.kmp)
implementation(libs.secp256k1.kmp.jvm)
Expand Down Expand Up @@ -353,15 +323,6 @@ fun KotlinNativeTarget.swiftCinterop(library: String, platform: String) {
}
}

tasks.withType<Test>().configureEach {
dependsOn(":bip32-ed25519:prepareRustLibs")
doFirst {
val paths = generatedJvmLibsDirs.joinToString(separator = File.pathSeparator) { it.absolutePath }
systemProperty("jna.library.path", paths)
jvmArgs("-Djava.library.path=$paths")
}
}

// === Group: Resource and Test Task Dependencies ===
val tasksRequiringRustLibs =
listOf(
Expand Down Expand Up @@ -450,7 +411,6 @@ val swiftPackageUpdateMinOSVersion =
}
}


afterEvaluate {
if (tasks.findByName("createSwiftPackage") != null) {
tasks.named("createSwiftPackage").configure {
Expand Down
9 changes: 8 additions & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,14 @@ subprojects {
artifact(javadocJar)

pom {
name.set("Identus " + project.name.replaceFirstChar { if (it.isLowerCase()) it.titlecase(Locale.getDefault()) else it.toString() })
name.set(
"Identus " +
project
.name
.replaceFirstChar {
if (it.isLowerCase()) it.titlecase(Locale.getDefault()) else it.toString()
}
)
description.set(project.description)
url.set("https://docs.atalaprism.io/")

Expand Down
Loading