Skip to content

Commit

Permalink
Merge pull request #806 from SpineEventEngine/join-backticked-ext
Browse files Browse the repository at this point in the history
Migrate `Stringifiers` to Kotlin
  • Loading branch information
alexander-yevsyukov authored Nov 4, 2023
2 parents 3c0eb04 + 85213a4 commit 702d265
Show file tree
Hide file tree
Showing 16 changed files with 627 additions and 552 deletions.
8 changes: 3 additions & 5 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -78,19 +78,17 @@ dependencies {
annotationProcessor(AutoService.processor)
compileOnly(AutoService.annotations)

implementation(Spine.logging)
implementation(Spine.Logging.lib)
implementation(Kotlin.reflect)

/* Have `protobuf` dependency instead of `api` or `implementation` so that proto
files from the library are included into the compilation. We need this because we
files from the library are included in the compilation. We need this because we
build our descriptor set files using those standard proto files too.
See Protobuf Gradle Plugin documentation for details:
https://github.com/google/protobuf-gradle-plugin#protos-in-dependencies
*/
Protobuf.libs.forEach {
protobuf(it)
}
protobuf(Protobuf.protoSrcLib)

testImplementation(Spine.testlib)
testImplementation(Spine.Logging.smokeTest)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,17 @@ package io.spine.internal.dependency
// https://github.com/protocolbuffers/protobuf
@Suppress(
"MemberVisibilityCanBePrivate" /* used directly from the outside */,
"ConstPropertyName"
"ConstPropertyName" /* https://bit.ly/kotlin-prop-names */
)
object Protobuf {
private const val group = "com.google.protobuf"
const val version = "3.24.4"
const val version = "3.25.0"
/**
* The Java library containing proto definitions of Google Protobuf.
*/
const val protoSrcLib = "${group}:protobuf-java:${version}"
val libs = listOf(
"${group}:protobuf-java:${version}",
protoSrcLib,
"${group}:protobuf-java-util:${version}",
"${group}:protobuf-kotlin:${version}"
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,6 @@ fun JsPlugins.protobuf() {

val protobufExt = project.extensions.getByType(ProtobufExtension::class.java)
protobufExt.apply {

generatedFilesBaseDir = projectDir.path

protoc {
artifact = Protobuf.compiler
}
Expand All @@ -65,7 +62,7 @@ fun JsPlugins.protobuf() {

remove("java")

// For information on JavaScript code generation please see
// For information on JavaScript code generation, please see
// https://github.com/google/protobuf/blob/master/js/README.md

id("js") {
Expand Down
18 changes: 9 additions & 9 deletions license-report.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@


# Dependencies of `io.spine:spine-base:2.0.0-SNAPSHOT.191`
# Dependencies of `io.spine:spine-base:2.0.0-SNAPSHOT.192`

## Runtime
1. **Group** : com.google.code.findbugs. **Name** : jsr305. **Version** : 3.0.2.
Expand Down Expand Up @@ -30,15 +30,15 @@
* **Project URL:** [https://github.com/google/j2objc/](https://github.com/google/j2objc/)
* **License:** [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt)

1. **Group** : com.google.protobuf. **Name** : protobuf-java. **Version** : 3.24.4.
1. **Group** : com.google.protobuf. **Name** : protobuf-java. **Version** : 3.25.0.
* **Project URL:** [https://developers.google.com/protocol-buffers/](https://developers.google.com/protocol-buffers/)
* **License:** [BSD-3-Clause](https://opensource.org/licenses/BSD-3-Clause)

1. **Group** : com.google.protobuf. **Name** : protobuf-java-util. **Version** : 3.24.4.
1. **Group** : com.google.protobuf. **Name** : protobuf-java-util. **Version** : 3.25.0.
* **Project URL:** [https://developers.google.com/protocol-buffers/](https://developers.google.com/protocol-buffers/)
* **License:** [BSD-3-Clause](https://opensource.org/licenses/BSD-3-Clause)

1. **Group** : com.google.protobuf. **Name** : protobuf-kotlin. **Version** : 3.24.4.
1. **Group** : com.google.protobuf. **Name** : protobuf-kotlin. **Version** : 3.25.0.
* **License:** [BSD-3-Clause](https://opensource.org/licenses/BSD-3-Clause)

1. **Group** : org.checkerframework. **Name** : checker-qual. **Version** : 3.37.0.
Expand Down Expand Up @@ -211,18 +211,18 @@
* **Project URL:** [https://github.com/google/j2objc/](https://github.com/google/j2objc/)
* **License:** [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt)

1. **Group** : com.google.protobuf. **Name** : protobuf-java. **Version** : 3.24.4.
1. **Group** : com.google.protobuf. **Name** : protobuf-java. **Version** : 3.25.0.
* **Project URL:** [https://developers.google.com/protocol-buffers/](https://developers.google.com/protocol-buffers/)
* **License:** [BSD-3-Clause](https://opensource.org/licenses/BSD-3-Clause)

1. **Group** : com.google.protobuf. **Name** : protobuf-java-util. **Version** : 3.24.4.
1. **Group** : com.google.protobuf. **Name** : protobuf-java-util. **Version** : 3.25.0.
* **Project URL:** [https://developers.google.com/protocol-buffers/](https://developers.google.com/protocol-buffers/)
* **License:** [BSD-3-Clause](https://opensource.org/licenses/BSD-3-Clause)

1. **Group** : com.google.protobuf. **Name** : protobuf-kotlin. **Version** : 3.24.4.
1. **Group** : com.google.protobuf. **Name** : protobuf-kotlin. **Version** : 3.25.0.
* **License:** [BSD-3-Clause](https://opensource.org/licenses/BSD-3-Clause)

1. **Group** : com.google.protobuf. **Name** : protoc. **Version** : 3.24.4.
1. **Group** : com.google.protobuf. **Name** : protoc. **Version** : 3.25.0.
* **Project URL:** [https://developers.google.com/protocol-buffers/](https://developers.google.com/protocol-buffers/)
* **License:** [BSD-3-Clause](https://opensource.org/licenses/BSD-3-Clause)
* **License:** [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt)
Expand Down Expand Up @@ -781,4 +781,4 @@

The dependencies distributed under several licenses, are used according their commercial-use-friendly license.

This report was generated on **Tue Oct 31 23:31:52 WET 2023** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
This report was generated on **Fri Nov 03 18:38:41 WET 2023** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
10 changes: 5 additions & 5 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ all modules and does not describe the project structure per-subproject.
-->
<groupId>io.spine</groupId>
<artifactId>base</artifactId>
<version>2.0.0-SNAPSHOT.191</version>
<version>2.0.0-SNAPSHOT.192</version>

<inceptionYear>2015</inceptionYear>

Expand All @@ -32,19 +32,19 @@ all modules and does not describe the project structure per-subproject.
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
<version>3.24.4</version>
<version>3.25.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java-util</artifactId>
<version>3.24.4</version>
<version>3.25.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-kotlin</artifactId>
<version>3.24.4</version>
<version>3.25.0</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -168,7 +168,7 @@ all modules and does not describe the project structure per-subproject.
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protoc</artifactId>
<version>3.24.4</version>
<version>3.25.0</version>
</dependency>
<dependency>
<groupId>com.puppycrawl.tools</groupId>
Expand Down
Loading

0 comments on commit 702d265

Please sign in to comment.