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.

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

Update gradle to 7.3 #300

Merged
merged 5 commits into from
May 4, 2023
Merged

Update gradle to 7.3 #300

merged 5 commits into from
May 4, 2023

Conversation

mvicsokolova
Copy link
Collaborator

No description provided.

@mvicsokolova mvicsokolova changed the base branch from master to develop May 3, 2023 12:09
}

def pomFile = file("$buildDir/pom.xml")
def pomFile = file("$buildDir/publications/maven/pom-default.xml")
Copy link
Collaborator Author

@mvicsokolova mvicsokolova May 4, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Now I rely on the path of the pom file, created with generatePomFileForMavenPublication. Is it ok or I can set the custom path somehow?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Better to use related task destination, something like this:

def pomFile = tasks.named("generatePomFileForMainPublication", GenerateMavenPom).map { it.get().destintion() }.get()

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed

@mvicsokolova mvicsokolova requested a review from Tapchicoma May 4, 2023 10:28
@@ -305,15 +306,16 @@ tasks.withType(Test) {

task compileJavaModuleInfo(type: JavaCompile) {
def moduleName = "kotlinx.atomicfu" // this module's name
def compileKotlinJvm = kotlin.targets["jvm"].compilations["main"].compileKotlinTask
def compilation = kotlin.targets["jvm"].compilations["main"]
def compileKotlinTask = compilation.compileTaskProvider.get() as KotlinCompile
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: would be nice to not trigger compile task eager creation and just cast to TaskProvider<KotlinJvmCompile>. But it is completely optional in this PR and it could be fixed later by me.

}

def pomFile = file("$buildDir/pom.xml")
def pomFile = file("$buildDir/publications/maven/pom-default.xml")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Better to use related task destination, something like this:

def pomFile = tasks.named("generatePomFileForMainPublication", GenerateMavenPom).map { it.get().destintion() }.get()

@mvicsokolova mvicsokolova merged commit 0fac729 into develop May 4, 2023
@mvicsokolova mvicsokolova deleted the update-gradle branch May 4, 2023 22:41
woainikk pushed a commit that referenced this pull request Jun 26, 2023
* Migrated from Gradle 6 to 7
* Updated atomicfu-maven-plugin publication

(cherry picked from commit 0fac729)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants