Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove rest of old packaging scheme #7

Merged
merged 3 commits into from
Oct 24, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
with:
java-version: '11'
distribution: 'temurin'
- name: Build with Gradle
- name: Build and Test with Gradle
uses: gradle/gradle-build-action@bd5760595778326ba7f1441bcf7e88b49de61a25 # v2.6.0
with:
arguments: build
arguments: build publishToMavenLocal
48 changes: 12 additions & 36 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,16 @@ plugins {
id("io.github.detekt.gradle.compiler-plugin")
id("java-library")
id("maven-publish")
id("pl.allegro.tech.build.axion-release")
}

subprojects {
apply(plugin = "java-library")
apply(plugin = "maven-publish")
apply(plugin = "pl.allegro.tech.build.axion-release")

group = "com.github.certora.collections"
version = scmVersion.version

repositories {
mavenCentral()
Expand All @@ -37,40 +42,11 @@ subprojects {
}
}

publishing {
publications {
repositories {
maven {
name = "GitHubPackages"
url = URI("https://maven.pkg.github.com/Certora/collections")
credentials {
username = System.getenv("GITHUB_ACTOR")
password = System.getenv("GITHUB_TOKEN")
}
}
}

withType<MavenPublication> {
version = if (project.hasProperty("release")) {
"${project.version}"
} else {
"${project.version}-SNAPSHOT"
}

pom {
licenses {
license {
name.set("MIT License")
url.set("https://github.com/Certora/collections/blob/4bc9da2c8197aea0ed3ad8b32b5a3dbcd69e725e/LICENSE")
}
}
scm {
connection.set("scm:git:https://github.com/Certora/collections.git")
developerConnection.set("scm:git:ssh://github.com/Certora/collections.git")
url.set("https://github.com/Certora/collections/")
}
}
}
}
}
publishing {
publications {
create<MavenPublication>("maven") {
from(components["java"])
}
}
}
}
14 changes: 0 additions & 14 deletions collect/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -17,20 +17,6 @@ detekt {
config.setFrom("detekt.yml")
}

publishing {
publications {
create<MavenPublication>("certora-collections") {
from(components["java"])

pom {
name.set("Certrora Collections")
description.set("Efficient collection types for Kotlin")
url.set("http://www.github.com/Certora/collections")
}
}
}
}

dependencies {
implementation("org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.5")
detektPlugins(project(":detekt-treapability"))
Expand Down
8 changes: 0 additions & 8 deletions detekt-treapability/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,6 @@ tasks.withType<Test> {
testLogging.showStandardStreams = true
}

publishing {
publications {
create<MavenPublication>("certora-common-collections-detekt") {
from(components["java"])
}
}
}

dependencies {
val detektVersion: String by project
val junitVersion: String by project
Expand Down
3 changes: 1 addition & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
group=com.certora
version=0.1.0
kotlinVersion=1.8.21
javaVersion=11
detektVersion=1.23.1
junitVersion=5.9.1
axionVersion=1.15.5
2 changes: 2 additions & 0 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
pluginManagement {
val kotlinVersion: String by settings
val detektVersion: String by settings
val axionVersion: String by settings
plugins {
id("org.jetbrains.kotlin.jvm") version kotlinVersion
kotlin("plugin.serialization") version kotlinVersion
id("io.github.detekt.gradle.compiler-plugin") version detektVersion
id("pl.allegro.tech.build.axion-release") version axionVersion
}
repositories {
mavenCentral()
Expand Down