From 5a4643dc5745c0643a82b08ef3242a691613f50e Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Tue, 29 Nov 2022 03:29:06 +0530 Subject: [PATCH] refactor: start consuming whetstone through Sonatype snapshots repository It was much easier to set up automatic publishing than to constantly debug weird build errors from included builds --- gradle/libs.versions.toml | 4 ++-- settings.gradle.kts | 35 ++++++++--------------------------- 2 files changed, 10 insertions(+), 29 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index f4daf51c..16c3f200 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -15,7 +15,7 @@ retrofit = "2.9.0" richtext = "0.15.0" serialization = "1.4.1" sqldelight = "2.0.0-alpha04" -whetstone = "0.3.0" +whetstone = "0.5.0-SNAPSHOT" workmanager = "2.8.0-beta02" [libraries] @@ -87,4 +87,4 @@ whetstone = { module = "com.deliveryhero.whetstone:whetstone", version.ref = "wh android-test = { id = "com.android.test", version.ref = "agp" } anvil = "com.squareup.anvil:2.4.2" sqldelight = { id = "app.cash.sqldelight", version.ref = "sqldelight" } -whetstone = { id = "com.deliveryhero.whetstone", version.ref = "whetstone" } +whetstone = { id = "dev.msfjarvis.whetstone", version.ref = "whetstone" } diff --git a/settings.gradle.kts b/settings.gradle.kts index 0ebcd3a6..6d1c4962 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -6,8 +6,6 @@ */ @file:Suppress("UnstableApiUsage") -import me.champeau.gradle.igp.gitRepositories - pluginManagement { repositories { exclusiveContent { @@ -43,38 +41,17 @@ pluginManagement { includeModule("gradle.plugin.org.gradle.android", "android-cache-fix-gradle-plugin") includeModule("com.sergei-lapin.napt", "com.sergei-lapin.napt.gradle.plugin") includeModule("com.sergei-lapin.napt", "gradle") - includeModule("me.champeau.includegit", "me.champeau.includegit.gradle.plugin") - includeModule("me.champeau.gradle.includegit", "plugin") } } + exclusiveContent { + forRepository { maven("https://oss.sonatype.org/content/repositories/snapshots/") } + filter { includeGroup("dev.msfjarvis.whetstone") } + } includeBuild("build-logic") mavenCentral() } } -plugins { id("me.champeau.includegit") version "0.1.5" } - -gitRepositories { - checkoutsDirectory.set(rootProject.projectDir.resolve("build/checkouts")) - include("whetstone") { - uri.set("https://github.com/msfjarvis/whetstone") - tag.set("msfjarvis-2022-11-29") - includeBuild { - dependencySubstitution { - for (module in - listOf( - "whetstone", - "whetstone-compiler", - "whetstone-compose", - "whetstone-worker", - )) { - substitute(module("com.deliveryhero.whetstone:$module")).using(project(":$module")) - } - } - } - } -} - dependencyResolutionManagement { repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) repositories { @@ -155,6 +132,10 @@ dependencyResolutionManagement { includeModule("gradle.plugin.org.gradle.android", "android-cache-fix-gradle-plugin") } } + exclusiveContent { + forRepository { maven("https://oss.sonatype.org/content/repositories/snapshots/") } + filter { includeGroup("dev.msfjarvis.whetstone") } + } mavenCentral() } }