From 803ca4dbe62d7bfaade7fc798958a7c901bc413d Mon Sep 17 00:00:00 2001 From: Andre Weber Date: Mon, 15 Jan 2024 08:27:43 +0100 Subject: [PATCH] feature: Remove Reference to GitHub Packages Closes: #36 Signed-off-by: Andre Weber --- .github/workflows/build-main.yaml | 4 ---- .github/workflows/build-pull-request.yaml | 4 ---- .github/workflows/create-github-release.yaml | 4 ---- gradle/libs.versions.toml | 2 +- settings.gradle.kts | 23 -------------------- 5 files changed, 1 insertion(+), 36 deletions(-) diff --git a/.github/workflows/build-main.yaml b/.github/workflows/build-main.yaml index 2162963..2b6d6cb 100644 --- a/.github/workflows/build-main.yaml +++ b/.github/workflows/build-main.yaml @@ -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 diff --git a/.github/workflows/build-pull-request.yaml b/.github/workflows/build-pull-request.yaml index 95135b0..f0d54ae 100755 --- a/.github/workflows/build-pull-request.yaml +++ b/.github/workflows/build-pull-request.yaml @@ -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 diff --git a/.github/workflows/create-github-release.yaml b/.github/workflows/create-github-release.yaml index f2cc1a1..240baf9 100644 --- a/.github/workflows/create-github-release.yaml +++ b/.github/workflows/create-github-release.yaml @@ -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 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 1bf41d3..a7af51c 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -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" diff --git a/settings.gradle.kts b/settings.gradle.kts index 709fd36..7d9882c 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -17,8 +17,6 @@ * */ -import java.util.Properties - pluginManagement { repositories { mavenLocal() @@ -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)