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 stuff to 2024 and fix macos library loading issues #978

Merged
merged 24 commits into from
Oct 26, 2023

Conversation

srimanachanta
Copy link
Member

based on #972

@srimanachanta srimanachanta requested a review from a team as a code owner October 23, 2023 15:16
gradle/wrapper/gradle-wrapper.properties Show resolved Hide resolved
@@ -36,24 +36,3 @@ task writeCurrentVersionJava {
}

build.dependsOn writeCurrentVersionJava

Copy link
Contributor

Choose a reason for hiding this comment

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

Iirc this code block is require -- why are we removing it

// for macOS
// https://github.com/opencv/opencv/issues/20269
nativeUtils.platformConfigs.osxuniversal.cppCompiler.args.add("-Wno-deprecated-anon-enum-enum-conversion")
nativeUtils.platformConfigs.linuxathena.cppCompiler.args.add("-Wno-deprecated-anon-enum-enum-conversion")
Copy link
Contributor

Choose a reason for hiding this comment

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

Why yeet


nativeTasks.addToSourceSetResources(sourceSets.main)

nativeConfig.dependencies.add wpilibTools.deps.cscore()
Copy link
Contributor

Choose a reason for hiding this comment

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

Why remove this code block?

photon-server/build.gradle Outdated Show resolved Hide resolved
@srimanachanta srimanachanta added this to the 2024 Beta milestone Oct 25, 2023
@mcm001
Copy link
Contributor

mcm001 commented Oct 25, 2023

The JAR that Actions spits out runs on Windows for me at least

@srimanachanta srimanachanta merged commit 6314778 into PhotonVision:master Oct 26, 2023
22 checks passed
@srimanachanta srimanachanta deleted the opencv-macos-fix branch October 26, 2023 00:28
@srimanachanta srimanachanta mentioned this pull request Oct 28, 2023
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