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

Jump to bottom

Cherry-pick IDEA 2024.1+ specific fixes from feature/untested-release branch #2981

Merged
merged 2 commits into from
Nov 6, 2024
+0 −16
Merged

Cherry-pick IDEA 2024.1+ specific fixes from feature/untested-release branch #2981

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1a5b89b
Remove `dokkaJar` from the list of published JAR artifacts (#2971)
0x6675636b796f75676974687562 Oct 31, 2024
9c9c833
Remove `macosX64` target as it's causing problems with IDEA 2024.1+ (…
0x6675636b796f75676974687562 Oct 31, 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
8 changes: 0 additions & 8 deletions gradle/plugins/src/main/kotlin/com/saveourtool/save/buildutils/PublishingConfiguration.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,11 @@ import org.gradle.api.publish.PublishingExtension
import org.gradle.api.publish.maven.MavenPublication
import org.gradle.api.publish.maven.tasks.AbstractPublishToMaven
import org.gradle.api.tasks.TaskCollection
import org.gradle.api.tasks.bundling.Jar
import org.gradle.internal.logging.text.StyledTextOutput
import org.gradle.internal.logging.text.StyledTextOutput.Style.Failure
import org.gradle.internal.logging.text.StyledTextOutput.Style.Success
import org.gradle.internal.logging.text.StyledTextOutputFactory
import org.gradle.kotlin.dsl.configure
import org.gradle.kotlin.dsl.create
import org.gradle.kotlin.dsl.getByType
import org.gradle.kotlin.dsl.support.serviceOf
import org.gradle.kotlin.dsl.withType
Expand Down Expand Up @@ -73,11 +71,6 @@ fun Project.configureSigning() {

@Suppress("TOO_LONG_FUNCTION")
internal fun Project.configurePublications() {
val dokkaJar: Jar = tasks.create<Jar>("dokkaJar") {
group = "documentation"
archiveClassifier.set("javadoc")
from(tasks.findByName("dokkaHtml"))
}
configure<PublishingExtension> {
repositories {
mavenLocal()
Expand All @@ -87,7 +80,6 @@ internal fun Project.configurePublications() {
* The content of this section will get executed only if
* a particular module has a `publishing {}` section.
*/
this.artifact(dokkaJar)
this.pom {
name.set(project.name)
description.set(project.description ?: project.name)
Expand Down
3 changes: 0 additions & 3 deletions save-cloud-common/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ kotlin {

// setup native compilation
linuxX64()
macosX64()

sourceSets {
sourceSets.all {
Expand Down Expand Up @@ -107,13 +106,11 @@ kotlin {
}

val linuxX64Main by getting
val macosX64Main by getting

@Suppress("UNUSED_VARIABLE")
val nativeMain by creating {
dependsOn(commonMain)
linuxX64Main.dependsOn(this)
macosX64Main.dependsOn(this)

dependencies {
implementation(libs.ktoml.core)
Expand Down
5 changes: 0 additions & 5 deletions save-demo-agent/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,13 @@ kotlin {
}
}
}
macosX64(configureNative)
linuxX64(configureNative)

sourceSets {
val macosX64Main by getting
val linuxX64Main by getting

@Suppress("UNUSED_VARIABLE")
val nativeMain by creating {
macosX64Main.dependsOn(this)
linuxX64Main.dependsOn(this)

dependencies {
Expand All @@ -51,12 +48,10 @@ kotlin {
}
}

val macosX64Test by getting
val linuxX64Test by getting

@Suppress("UNUSED_VARIABLE")
val nativeTest by creating {
macosX64Test.dependsOn(this)
linuxX64Test.dependsOn(this)
dependencies {
implementation(libs.kotlin.test)
Expand Down
Loading