Repository navigation
Fixes Release builds ignore repository variables - #80
Merged
Merged
Conversation
ndegwamartin
enabled auto-merge (squash)
September 16, 2026 15:33
Contributor
|
@ndegwamartin Confirm if this is related to this #74 |
Contributor
Author
@ellykits looks like it is. |
MeshackKangi
pushed a commit
to MeshackKangi/ohs-player-reference-client-app
that referenced
this pull request
Sep 23, 2026
The LoginRedirectActivity intent-filter hardcoded its scheme and host, so the OAuth redirect could drift from the OAUTH_REDIRECT_SCHEME / OAUTH_REDIRECT_HOST values the app actually authenticates with. Upstream fixed this in PR ohs-foundation#80 by injecting both as manifest placeholders. Port that fix into the split-module layout: the app module resolves the placeholders and supplies them via defaultConfig, and the library manifest references ${oauthRedirectScheme} / ${oauthRedirectHost}. The placeholders cannot live in the library module because the KMP androidLibrary { } DSL does not expose manifestPlaceholders. Hoist the library's OAuth config reads to script-level vals so the placeholders and generateAuthConfig source from the same values.
MeshackKangi
pushed a commit
to MeshackKangi/ohs-player-reference-client-app
that referenced
this pull request
Sep 23, 2026
Upstream 1fac23e (PR ohs-foundation#80) added OAuth manifest placeholders to the old reference-app/ layout. That layout was split into androidApp and ohs-player-library on this branch, and the same fix was already ported into the new layout in 2f3bb13. Git's rename detection aligned upstream's reference-app/build.gradle.kts with ohs-player-library/build.gradle.kts and upstream's reference-app manifest with ohs-player-library's manifest, producing two content conflicts. Both were resolved in favour of HEAD: the upstream hunks target files that no longer exist, and their substance is already present in androidApp and ohs-player-library. The .github/workflows/release.yml, README.md, and local.properties.sample changes from upstream auto-merged and are kept.
2 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #79