Merge branch 'MOB-30327_support_for_android_studio_flamingo'

# Conflicts: # plugins/hh-geminio/gradle.properties
hhru · May 3, 2023 · d6a6a6b · d6a6a6b
2 parents 456eb0c + 5657d62
commit d6a6a6b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/plugins/hh-geminio/gradle.properties b/plugins/hh-geminio/gradle.properties
@@ -1,4 +1,4 @@
-pluginVersion=1.5.0
+pluginVersion=1.5.1
 
 pluginGroup=ru.hh.plugins
 pluginName=hh-geminio

diff --git a/...nio-sdk/src/main/kotlin/ru/hh/plugins/geminio/sdk/template/mapping/GeminioRecipeMapper.kt b/...nio-sdk/src/main/kotlin/ru/hh/plugins/geminio/sdk/template/mapping/GeminioRecipeMapper.kt
@@ -90,9 +90,13 @@ private fun getHardcodedParamsMap(
     }
 
     var currentDirPackageName = targetDirectory.path.replace("/", ".")
-    currentDirPackageName = currentDirPackageName.substring(
-        currentDirPackageName.indexOf(packageName)
-    )
+    val packageNameIndex = currentDirPackageName.indexOf(packageName)
+    if (packageNameIndex != -1) {
+        currentDirPackageName = currentDirPackageName.substring(
+            packageNameIndex
+        )
+    }
+
 
     return mapOf(
         HardcodedParams.PACKAGE_NAME to packageName,