Merge branch 'main' into feature-24

CHANGELOG.md

@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file. See [commit-and-tag-version](https://github.com/absolute-version/commit-and-tag-version) for commit guidelines.
 
+## [0.1.3](https://github.com/eclipse-kuksa/kuksa-android-sdk/compare/release/release/v0.1.2...release/v0.1.3) (2024-01-22)
+
+
+### Bug Fixes
+
+* VSS Specification Generation fails for specific Folder Structure ([9f9f285](https://github.com/eclipse-kuksa/kuksa-android-sdk/commit/9f9f28561dafe2e32fce5fb8be72d5882e04b035))
+
 ## [0.1.2](https://github.com/eclipse-kuksa/kuksa-android-sdk/compare/release/release/v0.1.1...release/v0.1.2) (2023-12-04)
 
 

version.txt

@@ -1 +1 @@
-0.1.2
+0.1.3

vss-processor/src/main/kotlin/org/eclipse/kuksa/vssprocessor/VssDefinitionProcessor.kt

@@ -100,8 +100,8 @@ class VssDefinitionProcessor(
         private fun loadAssetFile(fileName: String): File? {
             val generatedFile = codeGenerator.generatedFile.firstOrNull() ?: return null
             val generationPath = generatedFile.absolutePath
-            val buildPath = generationPath.replaceAfter(BUILD_FOLDER_NAME, "")
-            val assetsFilePath = "$buildPath/$ASSETS_BUILD_DIRECTORY"
+            val buildPath = generationPath.replaceAfterLast(buildDir, "")
+            val assetsFilePath = buildPath + fileSeparator + assetsDir
             val assetsFolder = File(assetsFilePath)
 
             return assetsFolder.walk().firstOrNull { it.name == fileName }
@@ -137,11 +137,13 @@ class VssDefinitionProcessor(
         }
     }
 
-    companion object {
+    private companion object {
         private const val PACKAGE_NAME = "org.eclipse.kuksa.vss"
         private const val FILE_NAME_PROCESSOR_POSTFIX = "Processor"
-        private const val ASSETS_BUILD_DIRECTORY = "intermediates/assets/"
-        private const val BUILD_FOLDER_NAME = "build/"
+
+        private val fileSeparator = File.separator
+        private val assetsDir = "intermediates" + fileSeparator + "assets" + fileSeparator
+        private val buildDir = fileSeparator + "build" + fileSeparator
     }
 }