net.sourceforge.pmd
diff --git a/settings.gradle b/settings.gradle.kts
similarity index 89%
rename from settings.gradle
rename to settings.gradle.kts
index db608a3ec..337ce19a7 100644
--- a/settings.gradle
+++ b/settings.gradle.kts
@@ -18,8 +18,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-rootProject.name = 'spine-gcloud-java'
+rootProject.name = "spine-gcloud-java"
-include 'datastore'
-include 'stackdriver-trace'
-include 'testutil-gcloud'
+include("datastore")
+include("stackdriver-trace")
+include("testutil-gcloud")
diff --git a/stackdriver-trace/build.gradle b/stackdriver-trace/build.gradle.kts
similarity index 91%
rename from stackdriver-trace/build.gradle
rename to stackdriver-trace/build.gradle.kts
index c3c6ee589..c2f91ef3b 100644
--- a/stackdriver-trace/build.gradle
+++ b/stackdriver-trace/build.gradle.kts
@@ -18,7 +18,10 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+plugins {
+ `java-library`
+}
dependencies {
- api "com.google.cloud:google-cloud-trace:0.109.3-beta"
+ api("com.google.cloud:google-cloud-trace:0.109.3-beta")
}
diff --git a/stackdriver-trace/src/main/java/io/spine/server/trace/stackdriver/SignalSpan.java b/stackdriver-trace/src/main/java/io/spine/server/trace/stackdriver/SignalSpan.java
index f3508606b..4fd525018 100644
--- a/stackdriver-trace/src/main/java/io/spine/server/trace/stackdriver/SignalSpan.java
+++ b/stackdriver-trace/src/main/java/io/spine/server/trace/stackdriver/SignalSpan.java
@@ -108,7 +108,7 @@ private String displayName() {
private Span.Builder buildSpan(ProjectId projectId) {
SpanId spanId = SpanId.random();
- Timestamp whenStarted = signal.time();
+ Timestamp whenStarted = signal.timestamp();
Timestamp whenFinished = Time.currentTime();
TruncatableString displayName = Truncate.stringTo(displayName(), SPAN_DISPLAY_NAME_LENGTH);
return Span
diff --git a/testutil-gcloud/build.gradle b/testutil-gcloud/build.gradle.kts
similarity index 88%
rename from testutil-gcloud/build.gradle
rename to testutil-gcloud/build.gradle.kts
index 5155ffaed..94af40594 100644
--- a/testutil-gcloud/build.gradle
+++ b/testutil-gcloud/build.gradle.kts
@@ -18,7 +18,9 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+import io.spine.gradle.internal.Deps
+
dependencies {
- implementation project(path: ':datastore')
- implementation deps.test.junit5Api
+ implementation(project(":datastore"))
+ Deps.test.junit5Api.forEach { implementation(it) }
}
diff --git a/version.gradle b/version.gradle.kts
similarity index 79%
rename from version.gradle
rename to version.gradle.kts
index 7857e87c6..0ea01c2f5 100644
--- a/version.gradle
+++ b/version.gradle.kts
@@ -21,15 +21,10 @@
/**
* The versions of the libraries to be used.
*
- * This file defines versions for the dependencies that are not covered by
- * {@code .config/gradle/dependencies.gradle}.
+ * This file defines versions for the dependencies that are not covered by
+ * `.config/gradle/dependencies.gradle`.
*/
-ext {
- versionToPublish = '1.5.0'
-
- spineBaseVersion = versionToPublish
- spineCoreVersion = versionToPublish
-
- datastoreVersion = '1.102.2'
-}
+val spineCoreVersion: String by extra("1.5.14")
+val versionToPublish: String by extra(spineCoreVersion)
+val spineBaseVersion: String by extra("1.5.12")