Skip to content

Commit

Permalink
Merge pull request #37 from boschglobal/feature-36
Browse files Browse the repository at this point in the history
feature: Remove Reference to GitHub Packages
  • Loading branch information
SebastianSchildt authored Jan 16, 2024
2 parents b5a0d80 + 803ca4d commit 83d2707
Show file tree
Hide file tree
Showing 5 changed files with 1 addition and 36 deletions.
4 changes: 0 additions & 4 deletions .github/workflows/build-main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,6 @@ on:
branches:
- main

env:
GPR_USERNAME: ${{ github.actor }}
GPR_TOKEN: ${{ secrets.GITHUB_TOKEN }}

jobs:
validate-project:
uses: ./.github/workflows/reusable-build-validation.yaml
Expand Down
4 changes: 0 additions & 4 deletions .github/workflows/build-pull-request.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,6 @@ name: Validate pull request
on:
pull_request

env:
GPR_USERNAME: ${{ github.actor }}
GPR_TOKEN: ${{ secrets.GITHUB_TOKEN }}

jobs:
validate-project:
uses: ./.github/workflows/reusable-build-validation.yaml
Expand Down
4 changes: 0 additions & 4 deletions .github/workflows/create-github-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,6 @@ permissions:

jobs:
deployment:
env:
GPR_USERNAME: ${{ github.actor }}
GPR_TOKEN: ${{ secrets.GITHUB_TOKEN }}

runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ androidxLifecycle = "2.6.2"
kotlinCompilerExtension = "1.5.4"
composeBom = "2023.10.01"
jvmTarget = "17"
kuksaSdk = "0.1.2-SNAPSHOT"
kuksaSdk = "0.1.2"
lifecycleRuntimeCompose = "2.6.2"
ramsesAar = "1.1.0"
navigationCompose = "2.7.5"
Expand Down
23 changes: 0 additions & 23 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@
*
*/

import java.util.Properties

pluginManagement {
repositories {
mavenLocal()
Expand Down Expand Up @@ -46,32 +44,11 @@ dependencyResolutionManagement {
google()
mavenCentral()
mavenLocal()
maven {
url = uri("https://maven.pkg.github.com/eclipse-kuksa/kuksa-android-sdk")
credentials {
val localProperties = loadLocalProperties()

username = System.getenv("GPR_USERNAME") ?: localProperties?.getProperty("gpr.user")
password = System.getenv("GPR_TOKEN") ?: localProperties?.getProperty("gpr.key")
}
}
}
}

include(":app")

// Needs to be redundant with buildSrc because the settings.gradle is compiled before the buildSrc folder
fun loadLocalProperties(): Properties? {
val localProperties = file("$rootDir/local.properties")
if (!localProperties.exists()) return null

localProperties.reader().use { reader ->
return Properties().apply {
load(reader)
}
}
}

refreshVersions {
rejectVersionIf {
candidate.stabilityLevel.isLessStableThan(current.stabilityLevel)
Expand Down

0 comments on commit 83d2707

Please sign in to comment.