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

Fix maven directories for publishing #1139

Closed
wants to merge 3 commits into from
Closed

Fix maven directories for publishing #1139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b074f89
Update build.gradle for photon-lib
r4stered Jan 8, 2024
8fc5866
Update photon-targeting gradle for maven publish
r4stered Jan 8, 2024
779e57b
update photontargeting name to PhotonTargeting
Jan 8, 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
2 changes: 1 addition & 1 deletion photon-lib/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ apply plugin: "edu.wpi.first.NativeUtils"
import java.nio.file.Path

ext {
nativeName = "photonlib"
Copy link
Member

@srimanachanta srimanachanta Jan 8, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

These really should be lowercase, this would also cause the vendordep to break which we want to avoid. Is there a specific reason why this change resolves the issue?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

def baseArtifactId = nativeName

This line makes the artifact id based on the nativename. Thats why this fixes the maven dir issue

Copy link
Contributor

Choose a reason for hiding this comment

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

Why would the vendor dep break?

Copy link
Member

Choose a reason for hiding this comment

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

Because the vendordep is looking for that, previously it was Title case but now it is all lowercase, old vendor deps are looking for Title case, whereas all beta vendordeps are looking for lowercase. Going back would break all beta vendordeps.

nativeName = "PhotonLib"
includePhotonTargeting = true
// Include the generated Version file
generatedHeaders = "src/generate/native/include"
Expand Down
2 changes: 1 addition & 1 deletion photon-targeting/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ plugins {
}

ext {
nativeName = "photontargeting"
nativeName = "PhotonTargeting"
}

apply from: "${rootDir}/shared/javacpp/setupBuild.gradle"
4 changes: 2 additions & 2 deletions shared/javacpp/setupBuild.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ model {
it.dependsOn generateProto
}
if(project.hasProperty('includePhotonTargeting')) {
lib project: ':photon-targeting', library: 'photontargeting', linkage: 'shared'
lib project: ':photon-targeting', library: 'PhotonTargeting', linkage: 'shared'
}
}

Expand Down Expand Up @@ -90,7 +90,7 @@ model {
it.dependsOn generateProto
}
if(project.hasProperty('includePhotonTargeting')) {
lib project: ':photon-targeting', library: 'photontargeting', linkage: 'shared'
lib project: ':photon-targeting', library: 'PhotonTargeting', linkage: 'shared'
}
}

Expand Down
Loading