Skip to content

Commit

Permalink
Merge pull request #803 from SpineEventEngine/bump-logging
Browse files Browse the repository at this point in the history
Detect logging class
  • Loading branch information
alexander-yevsyukov authored Aug 28, 2023
2 parents d8ab5a0 + e0eb82a commit 2f34f9d
Show file tree
Hide file tree
Showing 9 changed files with 13 additions and 25 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ object Spine {
*
* @see <a href="https://github.com/SpineEventEngine/logging">spine-logging</a>
*/
const val logging = "2.0.0-SNAPSHOT.206"
const val logging = "2.0.0-SNAPSHOT.209"

/**
* The version of [Spine.testlib].
Expand Down
4 changes: 2 additions & 2 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.188`
# Dependencies of `io.spine:spine-base:2.0.0-SNAPSHOT.189`

## Runtime
1. **Group** : com.google.code.findbugs. **Name** : jsr305. **Version** : 3.0.2.
Expand Down Expand Up @@ -787,4 +787,4 @@

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

This report was generated on **Tue Aug 22 19:18:28 WEST 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 **Sun Aug 27 20:50:01 WEST 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).
8 changes: 4 additions & 4 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.188</version>
<version>2.0.0-SNAPSHOT.189</version>

<inceptionYear>2015</inceptionYear>

Expand Down Expand Up @@ -50,7 +50,7 @@ all modules and does not describe the project structure per-subproject.
<dependency>
<groupId>io.spine</groupId>
<artifactId>spine-logging</artifactId>
<version>2.0.0-SNAPSHOT.206</version>
<version>2.0.0-SNAPSHOT.209</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand All @@ -68,7 +68,7 @@ all modules and does not describe the project structure per-subproject.
<dependency>
<groupId>io.spine</groupId>
<artifactId>spine-logging-backend</artifactId>
<version>2.0.0-SNAPSHOT.206</version>
<version>2.0.0-SNAPSHOT.209</version>
<scope>runtime</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -98,7 +98,7 @@ all modules and does not describe the project structure per-subproject.
<dependency>
<groupId>io.spine</groupId>
<artifactId>spine-logging-smoke-test</artifactId>
<version>2.0.0-SNAPSHOT.206</version>
<version>2.0.0-SNAPSHOT.209</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
5 changes: 1 addition & 4 deletions src/main/java/io/spine/code/proto/FileDescriptors.java
Original file line number Diff line number Diff line change
Expand Up @@ -48,16 +48,13 @@
import static java.lang.String.format;
import static java.util.stream.Collectors.toList;
import static java.util.stream.Collectors.toSet;
import static kotlin.jvm.JvmClassMappingKt.getKotlinClass;

/**
* A utility class which allows to obtain Protobuf file descriptors.
*/
public final class FileDescriptors {

// https://github.com/SpineEventEngine/logging/issues/33
private static final Logger<?> logger =
LoggingFactory.getLogger(getKotlinClass(FileDescriptors.class));
private static final Logger<?> logger = LoggingFactory.forEnclosingClass();

/**
* Extension of the descriptor set files.
Expand Down
4 changes: 1 addition & 3 deletions src/main/java/io/spine/code/proto/FileSet.java
Original file line number Diff line number Diff line change
Expand Up @@ -59,15 +59,13 @@
import static java.util.stream.Collectors.toList;
import static java.util.stream.Collectors.toMap;
import static java.util.stream.Collectors.toSet;
import static kotlin.jvm.JvmClassMappingKt.getKotlinClass;

/**
* A set of proto files represented by their {@linkplain FileDescriptor descriptors}.
*/
public final class FileSet {

// https://github.com/SpineEventEngine/logging/issues/33
private static final Logger<?> logger = LoggingFactory.getLogger(getKotlinClass(FileSet.class));
private static final Logger<?> logger = LoggingFactory.forEnclosingClass();

private static final FileDescriptor[] EMPTY = {};

Expand Down
4 changes: 1 addition & 3 deletions src/main/java/io/spine/code/proto/Linker.java
Original file line number Diff line number Diff line change
Expand Up @@ -46,15 +46,13 @@
import static java.lang.System.lineSeparator;
import static java.util.stream.Collectors.joining;
import static java.util.stream.Collectors.toList;
import static kotlin.jvm.JvmClassMappingKt.getKotlinClass;

/**
* Builds a set of {@link FileDescriptor}s from a list of {@link FileDescriptorProto}.
*/
final class Linker {

// https://github.com/SpineEventEngine/logging/issues/33
private static final Logger<?> logger = LoggingFactory.getLogger(getKotlinClass(Linker.class));
private static final Logger<?> logger = LoggingFactory.forEnclosingClass();

private static final FileDescriptor[] NO_DEPENDENCIES = {};

Expand Down
4 changes: 1 addition & 3 deletions src/main/java/io/spine/io/Delete.java
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,13 @@

import static com.google.common.base.Preconditions.checkNotNull;
import static java.lang.String.format;
import static kotlin.jvm.JvmClassMappingKt.getKotlinClass;

/**
* Utilities for delete operations on a file system.
*/
public final class Delete {

// https://github.com/SpineEventEngine/logging/issues/33
private static final Logger<?> logger = LoggingFactory.getLogger(getKotlinClass(Delete.class));
private static final Logger<?> logger = LoggingFactory.forEnclosingClass();

/** Prevents instantiation of this utility class. */
private Delete() {
Expand Down
5 changes: 1 addition & 4 deletions src/main/java/io/spine/type/KnownTypes.java
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@
import static java.lang.System.lineSeparator;
import static java.util.Comparator.comparing;
import static java.util.stream.Collectors.toSet;
import static kotlin.jvm.JvmClassMappingKt.getKotlinClass;

/**
* All Protobuf types known to the application.
Expand Down Expand Up @@ -311,9 +310,7 @@ private List<String> allUrlList() {
@Internal
public static final class Holder {

// https://github.com/SpineEventEngine/logging/issues/33
private static final Logger<?> logger =
LoggingFactory.getLogger(getKotlinClass(Holder.class));
private static final Logger<?> logger = LoggingFactory.forEnclosingClass();

/** The lock to synchronize the write access to the {@code KnownTypes} instance. */
private static final Lock lock = new ReentrantLock(false);
Expand Down
2 changes: 1 addition & 1 deletion version.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/

val versionToPublish: String by extra("2.0.0-SNAPSHOT.188")
val versionToPublish: String by extra("2.0.0-SNAPSHOT.189")

0 comments on commit 2f34f9d

Please sign in to comment.