Skip to content

Commit

Permalink
Drop use of GH packages (#15)
Browse files Browse the repository at this point in the history
  • Loading branch information
big-andy-coates committed Nov 10, 2022
1 parent 808a6f9 commit 28bc21b
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 34 deletions.
8 changes: 3 additions & 5 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,9 @@

version: 2
registries:
creek-github-packages:
maven-snapshots:
type: maven-repository
url: https://maven.pkg.github.com/creek-service/*
username: "Creek-Bot-Token"
password: "\u0067hp_LtyvXrQZen3WlKenUhv21Mg6NG38jn0AO2YH"
url: https://s01.oss.sonatype.org/content/repositories/snapshots/
updates:
- package-ecosystem: github-actions
directory: /
Expand All @@ -18,6 +16,6 @@ updates:
- package-ecosystem: gradle
directory: /
registries:
- creek-github-packages
- maven-snapshots
schedule:
interval: monthly
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ subprojects {
}

extra.apply {
set("creekVersion", "0.2.1-SNAPSHOT")
set("creekVersion", "0.2.0-SNAPSHOT")

set("log4jVersion", "2.19.0") // https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-core
set("guavaVersion", "31.1-jre") // https://mvnrepository.com/artifact/com.google.guava/guava
Expand Down
12 changes: 6 additions & 6 deletions buildSrc/src/main/kotlin/creek-common-convention.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -37,15 +37,15 @@ java {
}

repositories {
mavenCentral()

maven {
url = uri("https://maven.pkg.github.com/creek-service/*")
credentials {
username = "Creek-Bot-Token"
password = "\u0067hp_LtyvXrQZen3WlKenUhv21Mg6NG38jn0AO2YH"
url = uri("https://s01.oss.sonatype.org/content/repositories/snapshots/")
mavenContent {
includeGroup("org.creekservice")
snapshotsOnly()
}
}

mavenCentral()
}

configurations.all {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,17 +73,6 @@ tasks.jar {
}

publishing {
repositories {
maven {
name = "GitHubPackages"
url = uri("https://maven.pkg.github.com/creek-service/${rootProject.name}")
credentials {
username = System.getenv("GITHUB_ACTOR")
password = System.getenv("GITHUB_TOKEN")
}
}
}

publications.withType<MavenPublication>().configureEach {

if (prependRootName) {
Expand Down
11 changes: 0 additions & 11 deletions buildSrc/src/main/kotlin/creek-publishing-convention.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -53,17 +53,6 @@ tasks.register("publishPlugins") {
}

publishing {
repositories {
maven {
name = "GitHubPackages"
url = uri("https://maven.pkg.github.com/creek-service/${rootProject.name}")
credentials {
username = System.getenv("GITHUB_ACTOR")
password = System.getenv("GITHUB_TOKEN")
}
}
}

publications {
create<MavenPublication>("mavenJava") {
from(components["java"])
Expand Down

0 comments on commit 28bc21b

Please sign in to comment.