diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index c1a7258..1eef379 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Mon Jul 04 07:32:53 CEST 2022 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/settings.gradle.kts b/settings.gradle.kts index 0bae5eb..71b070b 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -29,16 +29,38 @@ pluginManagement { } dependencyResolutionManagement { + versionCatalogs { + val externalLibs by creating { + from("com.arithings.mobile:version-catalog:1.0.5") + } + } + + val props = java.util.Properties() + val localPropsFile = file("$rootDir/local.properties") + if (localPropsFile.exists()) { + props.load(java.io.FileInputStream(localPropsFile)) + } + + val githubUsername = System.getenv("PUBLISH_GITHUB_USERNAME") ?: props["GITHUB_USERNAME"]?.toString() + val githubPassword = System.getenv("PUBLISH_GITHUB_PASSWORD") ?: props["GITHUB_PASSWORD"]?.toString() + + val githubPackages = listOf( + "https://maven.pkg.github.com/airthings/android-version-catalog", + ) + repositories { mavenLocal() gradlePluginPortal() google() mavenCentral() - } - versionCatalogs { - val externalLibs by creating { - from("com.arithings.mobile:version-catalog:1.0.5") + githubPackages.forEach { uri -> + maven(uri) { + credentials { + username = githubUsername + password = githubPassword + } + } } } }