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

Android wrapper: Modernize build files #619

Merged
merged 1 commit into from Sep 22, 2023

Conversation

okarmazin
Copy link
Contributor

This PR updates the Android build files and updates project dependencies. No source files were changed.

I tried to introduce this change by incremental atomic commits to keep the build file history tracked by Git, but was unable to do so. The amount of changes required for the Kotlin script conversion was too great.

Notable changes:

  • Convert build scripts to Kotlin (build.gradle -> build.gradle.kts)
  • Kotlin 1.9.10
  • Gradle 8.3
  • Use Gradle Version Catalog
  • Android Gradle Plugin 8.1.1

@okarmazin
Copy link
Contributor Author

Supersedes #555

@axxel
Copy link
Collaborator

axxel commented Sep 21, 2023

The main road-block that prevented #555 from moving forward is still there: https://github.com/zxing-cpp/zxing-cpp/actions/runs/6262637658/job/17005466542?pr=619#step:3:34

@okarmazin
Copy link
Contributor Author

Updated the Java version used by the CI worker, should build now.

@axxel
Copy link
Collaborator

axxel commented Sep 21, 2023

Thanks, but apparently there is still something missing: https://github.com/zxing-cpp/zxing-cpp/actions/runs/6262900310/job/17006568650?pr=619

This commit updates the Android build files. No source files were changed.

Notable changes:
- Convert build scripts to Kotlin (build.gradle -> build.gradle.kts)
    I tried to introduce this change incrementally to keep the build file history
    tracked by Git, but was unable to do so.
- Kotlin 1.9.10
- Gradle 8.3, including the Gradle wrapper
- Use Gradle Version Catalog
- Android Gradle Plugin 8.1.1
@okarmazin
Copy link
Contributor Author

Right... Didn't know it was a required field.

Copy link
Collaborator

@axxel axxel left a comment

Choose a reason for hiding this comment

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

Thanks for your contribution. Much appreciated.

wrappers/android/app/build.gradle.kts Show resolved Hide resolved
wrappers/android/gradle/libs.versions.toml Show resolved Hide resolved
@benjohnde
Copy link
Contributor

Thanks for the contribution @okarmazin. I still want to overhaul the iOS wrapper someday very soon :) That's a nice push!

@axxel axxel merged commit e5c3763 into zxing-cpp:master Sep 22, 2023
16 checks passed
@okarmazin okarmazin deleted the android-modernization branch September 23, 2023 06:36
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.

None yet

3 participants