From 3952972febe650d705c9946e7ede61e00555e7a8 Mon Sep 17 00:00:00 2001 From: Naveed Jooma Date: Thu, 1 Aug 2024 14:49:55 -0400 Subject: [PATCH] Update deps --- .gitignore | 5 +++++ build.gradle | 2 +- core/sdk/build.gradle | 2 +- .../src/main/kotlin/com/viam/sdk/core/util/VersionInfo.kt | 4 ---- .../test/kotlin/com/viam/sdk/core/util/MetadataTest.kt | 2 +- java/services/mlmodel/build.gradle | 8 ++++---- 6 files changed, 12 insertions(+), 11 deletions(-) delete mode 100644 core/sdk/src/main/kotlin/com/viam/sdk/core/util/VersionInfo.kt diff --git a/.gitignore b/.gitignore index e4b86b2ef..a12cc6392 100644 --- a/.gitignore +++ b/.gitignore @@ -89,3 +89,8 @@ nb-configuration.xml ## Environment ############################## .env + +############################## +## Build Outputs +############################## +core/sdk/src/main/kotlin/com/viam/sdk/core/util/VersionInfo.kt diff --git a/build.gradle b/build.gradle index aed1b8c8f..9782219fc 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ plugins { } group 'com.viam' -version '0.0.6' +version '0.0.7-SNAPSHOT' repositories { google() diff --git a/core/sdk/build.gradle b/core/sdk/build.gradle index dab20c260..148cfda7b 100644 --- a/core/sdk/build.gradle +++ b/core/sdk/build.gradle @@ -73,5 +73,5 @@ abstract class CreateVersionFileTask extends DefaultTask { tasks.register("createVersionsFile", CreateVersionFileTask) afterEvaluate { - tasks.compileJava.dependsOn 'createVersionsFile' + tasks.compileKotlin.dependsOn 'createVersionsFile' } diff --git a/core/sdk/src/main/kotlin/com/viam/sdk/core/util/VersionInfo.kt b/core/sdk/src/main/kotlin/com/viam/sdk/core/util/VersionInfo.kt deleted file mode 100644 index fb9acbd45..000000000 --- a/core/sdk/src/main/kotlin/com/viam/sdk/core/util/VersionInfo.kt +++ /dev/null @@ -1,4 +0,0 @@ -package com.viam.sdk.core.util - -const val SDK_VERSION = "v0.0.5" -const val API_VERSION = "v0.1.327" diff --git a/core/sdk/src/test/kotlin/com/viam/sdk/core/util/MetadataTest.kt b/core/sdk/src/test/kotlin/com/viam/sdk/core/util/MetadataTest.kt index 2617bc5b7..e7e0bf192 100644 --- a/core/sdk/src/test/kotlin/com/viam/sdk/core/util/MetadataTest.kt +++ b/core/sdk/src/test/kotlin/com/viam/sdk/core/util/MetadataTest.kt @@ -13,7 +13,7 @@ class MetadataTest { assertNotNull(versionString) val components = versionString!!.split(";") assertEquals(components[0], "java") - assertTrue(components[1].matches("v[0-9]+\\.[0-9]+\\.[0-9]+".toRegex())) + assertTrue(components[1].matches("v[0-9]+\\.[0-9]+\\.[0-9]+(-SNAPSHOT)?".toRegex())) assertTrue(components[2].matches("(v[0-9]+\\.[0-9]+\\.[0-9]+)|unreleased".toRegex())) } } diff --git a/java/services/mlmodel/build.gradle b/java/services/mlmodel/build.gradle index 3e4aad274..a32e7a98a 100644 --- a/java/services/mlmodel/build.gradle +++ b/java/services/mlmodel/build.gradle @@ -8,9 +8,9 @@ ext.pomDisplayName = "Viam Java SDK - MLModel Service" dependencies { api project(':core:services:viam-core-sdk-mlmodel-service') - implementation "ai.djl:api:0.26.0" - runtimeOnly "ai.djl.pytorch:pytorch-engine:0.26.0" - runtimeOnly "ai.djl.onnxruntime:onnxruntime-engine:0.26.0" + implementation "ai.djl:api:0.29.0" + runtimeOnly "ai.djl.pytorch:pytorch-engine:0.29.0" + runtimeOnly "ai.djl.onnxruntime:onnxruntime-engine:0.29.0" } java { @@ -20,4 +20,4 @@ java { downloadLicenses { dependencyConfiguration = 'runtime' -} \ No newline at end of file +}