Skip to content

Commit

Permalink
Merge pull request #1758 from robstoll/chore/bc-api
Browse files Browse the repository at this point in the history
use bc-validator, apiDump based on tag v1.2.0
  • Loading branch information
robstoll authored May 10, 2024
2 parents 323a6cc + 0ce9394 commit 3de8b45
Show file tree
Hide file tree
Showing 20 changed files with 11,539 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ jobs:
KOTLIN_VERSION: ${{ matrix.kotlin_version }}
runs-on: ubuntu-latest
strategy:
fail-fast: true
fail-fast: false
matrix:
kotlin_version: [ '1.5', '1.6', '1.7', '1.8', '1.9' ]
steps:
Expand Down
580 changes: 580 additions & 0 deletions apis/fluent/atrium-api-fluent/api/main/atrium-api-fluent.api

Large diffs are not rendered by default.

Large diffs are not rendered by default.

963 changes: 963 additions & 0 deletions apis/infix/atrium-api-infix/api/main/atrium-api-infix.api

Large diffs are not rendered by default.

Large diffs are not rendered by default.

1,309 changes: 1,309 additions & 0 deletions atrium-core/api/main/atrium-core.api

Large diffs are not rendered by default.

1,310 changes: 1,310 additions & 0 deletions atrium-core/api/using-kotlin-1.9-or-newer/atrium-core.api

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ buildscript {

plugins {
id("build-logic.root-build")
id("io.github.gradle-nexus.publish-plugin") version "2.0.0"
alias(libs.plugins.nexus)
}


Expand Down
1 change: 1 addition & 0 deletions gradle/build-logic/root-build/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,5 @@ dependencies {

api(buildLibs.bundles.dokka)
api(buildLibs.tutteli.dokka)
api(buildLibs.bc.validator)
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,26 @@ import ch.tutteli.gradle.plugins.dokka.DokkaPluginExtension
import ch.tutteli.gradle.plugins.dokka.GhPages
import org.jetbrains.dokka.gradle.DokkaMultiModuleTask
import org.jetbrains.dokka.gradle.DokkaTaskPartial
import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
import org.jetbrains.kotlin.gradle.targets.js.npm.tasks.KotlinNpmInstallTask
import java.io.IOException
import java.net.URL


plugins {
id("build-logic.gradle-conventions")
id("org.jetbrains.kotlinx.binary-compatibility-validator")
}

val rootProject = this

ifIsPublishing {
println("""
println(
"""
|Publishing activated via env PUB=true, going to add tutteli-publish plugins and co. in sub-projects
|Also applying tutteli-dokka in root project for dokkaHtmlMultiModule
""".trimMargin())
""".trimMargin()
)
apply(plugin = "org.jetbrains.dokka")
apply(plugin = "ch.tutteli.gradle.plugins.dokka")

Expand Down Expand Up @@ -76,3 +80,25 @@ tasks.configureEach<KotlinNpmInstallTask> {
}
}

apiValidation {
ignoredProjects.addAll(
listOf(
// bundles
"atrium-fluent",
"atrium-infix",
// smoke-tests
"atrium-fluent-smoke-test",
"atrium-infix-smoke-test",
//misc not relevant for bc
"atrium-specs",
"atrium-verbs-internal",
"readme-examples"
)
)
val kotlinVersion = KotlinVersion.fromVersion(buildParameters.kotlin.version)
apiDumpDirectory = if (kotlinVersion >= KotlinVersion.KOTLIN_1_9) {
"api/using-kotlin-1.9-or-newer"
} else {
"api/main"
}
}
3 changes: 2 additions & 1 deletion gradle/buildLibs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
[versions]
bc-validator="0.15.0-Beta.2"
dokka = "1.9.20"
jacocoTool = "0.8.9"
kotlin = "1.9.24"
Expand All @@ -7,6 +8,7 @@ tutteli = "5.0.1"
vlsi = "1.90"

[libraries]
bc-validator = { module = "org.jetbrains.kotlinx.binary-compatibility-validator:org.jetbrains.kotlinx.binary-compatibility-validator.gradle.plugin", version.ref = "bc-validator" }
dokka-plugin = { module = "org.jetbrains.dokka:org.jetbrains.dokka.gradle.plugin", version.ref = "dokka" }
dokka-base = { module = "org.jetbrains.dokka:dokka-base", version.ref = "dokka" }
kotlin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
Expand All @@ -21,7 +23,6 @@ tutteli-spek = { module = "ch.tutteli.gradle.plugins.spek:ch.tutteli.gradle.plug
vlsi-crlf = { module = "com.github.vlsi.crlf:com.github.vlsi.crlf.gradle.plugin", version.ref = "vlsi" }
vlsi-gradle = { module = "com.github.vlsi.gradle-extensions:com.github.vlsi.gradle-extensions.gradle.plugin", version.ref = "vlsi" }


[bundles]
dokka = ["dokka-base", "dokka-plugin"]

Expand Down
6 changes: 6 additions & 0 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ spekExtensions = "1.2.1"
mockk = "1.11.0"
mockitoKotlin = "2.2.0"

# gradle
nexus="2.0.0"

[libraries]
assertJ = { module = "org.assertj:assertj-core", version.ref = "assertJ" }
junit-jupiter-api = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "junitJupiter" }
Expand All @@ -29,3 +32,6 @@ spek-runner = { module = "org.spekframework.spek2:spek-runner-junit5", version.r
spek-runtime = { module = "org.spekframework.spek2:spek-runtime-jvm", version.ref = "spek" }
spek-js = { module = "org.spekframework.spek2:spek-dsl-js", version.ref = "spek" }
tutteli-spek = { module = "ch.tutteli.spek:tutteli-spek-extensions", version.ref = "spekExtensions" }

[plugins]
nexus = { id = "io.github.gradle-nexus.publish-plugin", version.ref="nexus" }
2,228 changes: 2,228 additions & 0 deletions logic/atrium-logic/api/main/atrium-logic.api

Large diffs are not rendered by default.

2,228 changes: 2,228 additions & 0 deletions logic/atrium-logic/api/using-kotlin-1.9-or-newer/atrium-logic.api

Large diffs are not rendered by default.

24 changes: 24 additions & 0 deletions misc/atrium-verbs/api/main/atrium-verbs.api
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
public final class ch/tutteli/atrium/api/verbs/AssertionVerb : java/lang/Enum, ch/tutteli/atrium/reporting/translating/StringBasedTranslatable {
public static final field EXPECT Lch/tutteli/atrium/api/verbs/AssertionVerb;
public static final field EXPECT_GROUPED Lch/tutteli/atrium/api/verbs/AssertionVerb;
public fun getDefault ()Ljava/lang/String;
public fun getId ()Ljava/lang/String;
public synthetic fun getName ()Ljava/lang/String;
public fun getValue ()Ljava/lang/String;
public static fun valueOf (Ljava/lang/String;)Lch/tutteli/atrium/api/verbs/AssertionVerb;
public static fun values ()[Lch/tutteli/atrium/api/verbs/AssertionVerb;
}

public final class ch/tutteli/atrium/api/verbs/ExpectKt {
public static final fun expect (Lch/tutteli/atrium/creating/Expect;Ljava/lang/Object;)Lch/tutteli/atrium/creating/FeatureExpect;
public static final fun expect (Lch/tutteli/atrium/creating/Expect;Ljava/lang/Object;Lkotlin/jvm/functions/Function1;)Lch/tutteli/atrium/creating/Expect;
public static final fun expect (Lch/tutteli/atrium/creating/ExpectGrouping;Ljava/lang/Object;)Lch/tutteli/atrium/creating/Expect;
public static final fun expect (Lch/tutteli/atrium/creating/ExpectGrouping;Ljava/lang/Object;Lkotlin/jvm/functions/Function1;)Lch/tutteli/atrium/creating/Expect;
public static final fun expect (Ljava/lang/Object;)Lch/tutteli/atrium/creating/RootExpect;
public static final fun expect (Ljava/lang/Object;Lkotlin/jvm/functions/Function1;)Lch/tutteli/atrium/creating/Expect;
public static final fun expectGrouped (Lch/tutteli/atrium/creating/ExpectGrouping;Ljava/lang/String;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;)Lch/tutteli/atrium/creating/ExpectGrouping;
public static final fun expectGrouped (Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;)Lch/tutteli/atrium/creating/ExpectGrouping;
public static synthetic fun expectGrouped$default (Lch/tutteli/atrium/creating/ExpectGrouping;Ljava/lang/String;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lch/tutteli/atrium/creating/ExpectGrouping;
public static synthetic fun expectGrouped$default (Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lch/tutteli/atrium/creating/ExpectGrouping;
}

25 changes: 25 additions & 0 deletions misc/atrium-verbs/api/using-kotlin-1.9-or-newer/atrium-verbs.api
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
public final class ch/tutteli/atrium/api/verbs/AssertionVerb : java/lang/Enum, ch/tutteli/atrium/reporting/translating/StringBasedTranslatable {
public static final field EXPECT Lch/tutteli/atrium/api/verbs/AssertionVerb;
public static final field EXPECT_GROUPED Lch/tutteli/atrium/api/verbs/AssertionVerb;
public fun getDefault ()Ljava/lang/String;
public static fun getEntries ()Lkotlin/enums/EnumEntries;
public fun getId ()Ljava/lang/String;
public synthetic fun getName ()Ljava/lang/String;
public fun getValue ()Ljava/lang/String;
public static fun valueOf (Ljava/lang/String;)Lch/tutteli/atrium/api/verbs/AssertionVerb;
public static fun values ()[Lch/tutteli/atrium/api/verbs/AssertionVerb;
}

public final class ch/tutteli/atrium/api/verbs/ExpectKt {
public static final fun expect (Lch/tutteli/atrium/creating/Expect;Ljava/lang/Object;)Lch/tutteli/atrium/creating/FeatureExpect;
public static final fun expect (Lch/tutteli/atrium/creating/Expect;Ljava/lang/Object;Lkotlin/jvm/functions/Function1;)Lch/tutteli/atrium/creating/Expect;
public static final fun expect (Lch/tutteli/atrium/creating/ExpectGrouping;Ljava/lang/Object;)Lch/tutteli/atrium/creating/Expect;
public static final fun expect (Lch/tutteli/atrium/creating/ExpectGrouping;Ljava/lang/Object;Lkotlin/jvm/functions/Function1;)Lch/tutteli/atrium/creating/Expect;
public static final fun expect (Ljava/lang/Object;)Lch/tutteli/atrium/creating/RootExpect;
public static final fun expect (Ljava/lang/Object;Lkotlin/jvm/functions/Function1;)Lch/tutteli/atrium/creating/Expect;
public static final fun expectGrouped (Lch/tutteli/atrium/creating/ExpectGrouping;Ljava/lang/String;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;)Lch/tutteli/atrium/creating/ExpectGrouping;
public static final fun expectGrouped (Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;)Lch/tutteli/atrium/creating/ExpectGrouping;
public static synthetic fun expectGrouped$default (Lch/tutteli/atrium/creating/ExpectGrouping;Ljava/lang/String;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lch/tutteli/atrium/creating/ExpectGrouping;
public static synthetic fun expectGrouped$default (Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lch/tutteli/atrium/creating/ExpectGrouping;
}

Loading

0 comments on commit 3de8b45

Please sign in to comment.