UnitTestBot · mmvpm · May 31, 2022 · May 31, 2022
diff --git a/build.gradle b/build.gradle
@@ -27,6 +27,16 @@ subprojects {
     apply plugin: 'java'
     apply plugin: 'maven-publish'
 
+    publishing {
+        publications {
+            jar(MavenPublication) {
+                from components.java
+                groupId 'org.utbot'
+                artifactId project.name
+            }
+        }
+    }
+
     repositories {
         mavenCentral()
         maven { url 'https://jitpack.io' }

diff --git a/utbot-gradle/build.gradle b/utbot-gradle/build.gradle
@@ -18,8 +18,8 @@ configurations.all {
 gradlePlugin {
     plugins {
         sarifReportPlugin {
-            id = 'org.utbot.sarif'
-            implementationClass = 'org.utbot.sarif.SarifGradlePlugin'
+            id = 'org.utbot.gradle.plugin'
+            implementationClass = 'org.utbot.gradle.plugin.SarifGradlePlugin'
         }
     }
 }

diff --git a/utbot-gradle/docs/utbot-gradle.md b/utbot-gradle/docs/utbot-gradle.md
@@ -43,14 +43,14 @@ In addition, it creates one big SARIF-report containing the results from all the
   <details>
   <summary>Groovy</summary>
   <pre>
-  apply plugin: 'org.utbot.sarif'
+  apply plugin: 'org.utbot.gradle.plugin'
   </pre>
   </details>
 
   <details>
   <summary>Kotlin DSL</summary>
   <pre>
-  apply(plugin = "org.utbot.sarif")
+  apply(plugin = "org.utbot.gradle.plugin")
   </pre>
   </details>
 
@@ -195,11 +195,8 @@ There are two ways to do it.
       buildscript {
           repositories {
               mavenLocal()
-              maven {
-                  url "http://[your-ip]:[your-port]/repository/utbot-uber/"
-                  allowInsecureProtocol true
-              }
               mavenCentral()
+              maven { url 'https://jitpack.io' }
           }
       &nbsp;
           dependencies {
@@ -215,11 +212,8 @@ There are two ways to do it.
       buildscript {
           repositories {
               mavenLocal()
-              maven {
-                  url = uri("http://[your-ip]:[your-port]/repository/utbot-uber/")
-                  isAllowInsecureProtocol = true
-              }
               mavenCentral()
+              maven { url 'https://jitpack.io' }
           }
       &nbsp;
           dependencies {
@@ -239,11 +233,8 @@ There are two ways to do it.
       buildscript {
           repositories {
               mavenLocal()
-              maven {
-                  url "http://[your-ip]:[your-port]/repository/utbot-uber/"
-                  allowInsecureProtocol true
-              }
               mavenCentral()
+              maven { url 'https://jitpack.io' }
           }
       &nbsp;
           dependencies {
@@ -262,11 +253,8 @@ There are two ways to do it.
       buildscript {
           repositories {
               mavenLocal()
-              maven {
-                  url = uri("http://[your-ip]:[your-port]/repository/utbot-uber/")
-                  isAllowInsecureProtocol = true
-              }
               mavenCentral()
+              maven { url 'https://jitpack.io' }
           }
       &nbsp;
           dependencies {

diff --git a/.../org/utbot/sarif/CreateSarifReportTask.kt → ...ot/gradle/plugin/CreateSarifReportTask.kt b/.../org/utbot/sarif/CreateSarifReportTask.kt → ...ot/gradle/plugin/CreateSarifReportTask.kt
@@ -1,5 +1,8 @@
-package org.utbot.sarif
+package org.utbot.gradle.plugin
 
+import mu.KLogger
+import org.gradle.api.DefaultTask
+import org.gradle.api.tasks.TaskAction
 import org.utbot.common.bracket
 import org.utbot.common.debug
 import org.utbot.framework.codegen.ForceStaticMocking
@@ -9,18 +12,16 @@ import org.utbot.framework.plugin.api.UtBotTestCaseGenerator
 import org.utbot.framework.plugin.api.UtTestCase
 import org.utbot.framework.plugin.api.util.UtContext
 import org.utbot.framework.plugin.api.util.withUtContext
-import org.utbot.sarif.extension.SarifGradleExtensionProvider
-import org.utbot.sarif.wrappers.GradleProjectWrapper
-import org.utbot.sarif.wrappers.SourceFindingStrategyGradle
-import org.utbot.sarif.wrappers.SourceSetWrapper
-import org.utbot.sarif.wrappers.TargetClassWrapper
+import org.utbot.gradle.plugin.extension.SarifGradleExtensionProvider
+import org.utbot.gradle.plugin.wrappers.GradleProjectWrapper
+import org.utbot.gradle.plugin.wrappers.SourceFindingStrategyGradle
+import org.utbot.gradle.plugin.wrappers.SourceSetWrapper
+import org.utbot.gradle.plugin.wrappers.TargetClassWrapper
+import org.utbot.sarif.SarifReport
 import org.utbot.summary.summarize
 import java.net.URLClassLoader
 import java.nio.file.Path
 import javax.inject.Inject
-import mu.KLogger
-import org.gradle.api.DefaultTask
-import org.gradle.api.tasks.TaskAction
 
 /**
  * The main class containing the entry point [createSarifReport].
@@ -59,7 +60,7 @@ open class CreateSarifReportTask @Inject constructor(
     // internal
 
     // overwriting the getLogger() function from the DefaultTask
-    private val logger: KLogger = org.utbot.sarif.logger
+    private val logger: KLogger = org.utbot.gradle.plugin.logger
 
     /**
      * Generates tests and a SARIF report for classes in the [gradleProject] and in all its child projects.

diff --git a/...tlin/org/utbot/sarif/SarifGradlePlugin.kt → .../utbot/gradle/plugin/SarifGradlePlugin.kt b/...tlin/org/utbot/sarif/SarifGradlePlugin.kt → .../utbot/gradle/plugin/SarifGradlePlugin.kt
@@ -1,14 +1,14 @@
-package org.utbot.sarif
+package org.utbot.gradle.plugin
 
-import org.utbot.sarif.extension.SarifGradleExtension
-import org.utbot.sarif.extension.SarifGradleExtensionProvider
-import java.io.File
+import mu.KotlinLogging
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.api.plugins.JavaPluginConvention
 import org.gradle.api.tasks.SourceSet
 import org.gradle.api.tasks.TaskProvider
-import mu.KotlinLogging
+import org.utbot.gradle.plugin.extension.SarifGradleExtension
+import org.utbot.gradle.plugin.extension.SarifGradleExtensionProvider
+import java.io.File
 
 internal val logger = KotlinLogging.logger {}
 

diff --git a/...t/sarif/extension/SarifGradleExtension.kt → .../plugin/extension/SarifGradleExtension.kt b/...t/sarif/extension/SarifGradleExtension.kt → .../plugin/extension/SarifGradleExtension.kt
@@ -1,4 +1,4 @@
-package org.utbot.sarif.extension
+package org.utbot.gradle.plugin.extension
 
 import org.gradle.api.provider.ListProperty
 import org.gradle.api.provider.Property

diff --git a/...extension/SarifGradleExtensionProvider.kt → ...extension/SarifGradleExtensionProvider.kt b/...extension/SarifGradleExtensionProvider.kt → ...extension/SarifGradleExtensionProvider.kt
@@ -1,21 +1,14 @@
-package org.utbot.sarif.extension
+package org.utbot.gradle.plugin.extension
 
+import org.gradle.api.Project
 import org.utbot.common.PathUtil.toPath
 import org.utbot.engine.Mocker
-import org.utbot.framework.codegen.ForceStaticMocking
-import org.utbot.framework.codegen.Junit4
-import org.utbot.framework.codegen.Junit5
-import org.utbot.framework.codegen.MockitoStaticMocking
-import org.utbot.framework.codegen.NoStaticMocking
-import org.utbot.framework.codegen.StaticsMocking
-import org.utbot.framework.codegen.TestFramework
-import org.utbot.framework.codegen.TestNg
+import org.utbot.framework.codegen.*
 import org.utbot.framework.plugin.api.ClassId
 import org.utbot.framework.plugin.api.CodegenLanguage
 import org.utbot.framework.plugin.api.MockFramework
 import org.utbot.framework.plugin.api.MockStrategyApi
 import java.io.File
-import org.gradle.api.Project
 
 /**
  * Provides all [SarifGradleExtension] fields in a convenient form:

diff --git a/...ot/sarif/wrappers/GradleProjectWrapper.kt → ...e/plugin/wrappers/GradleProjectWrapper.kt b/...ot/sarif/wrappers/GradleProjectWrapper.kt → ...e/plugin/wrappers/GradleProjectWrapper.kt
@@ -1,12 +1,12 @@
-package org.utbot.sarif.wrappers
+package org.utbot.gradle.plugin.wrappers
 
-import org.utbot.common.FileUtil.createNewFileWithParentDirectories
-import org.utbot.sarif.extension.SarifGradleExtensionProvider
-import java.io.File
-import java.nio.file.Paths
 import org.gradle.api.Project
 import org.gradle.api.plugins.JavaPluginConvention
 import org.gradle.api.tasks.SourceSet
+import org.utbot.common.FileUtil.createNewFileWithParentDirectories
+import org.utbot.gradle.plugin.extension.SarifGradleExtensionProvider
+import java.io.File
+import java.nio.file.Paths
 
 /**
  * Contains information about the gradle project for which we are creating a SARIF report.

diff --git a/...f/wrappers/SourceFindingStrategyGradle.kt → ...n/wrappers/SourceFindingStrategyGradle.kt b/...f/wrappers/SourceFindingStrategyGradle.kt → ...n/wrappers/SourceFindingStrategyGradle.kt
@@ -1,4 +1,4 @@
-package org.utbot.sarif.wrappers
+package org.utbot.gradle.plugin.wrappers
 
 import org.utbot.common.PathUtil
 import org.utbot.common.PathUtil.toPath

diff --git a/.../utbot/sarif/wrappers/SourceSetWrapper.kt → ...radle/plugin/wrappers/SourceSetWrapper.kt b/.../utbot/sarif/wrappers/SourceSetWrapper.kt → ...radle/plugin/wrappers/SourceSetWrapper.kt
@@ -1,5 +1,6 @@
-package org.utbot.sarif.wrappers
+package org.utbot.gradle.plugin.wrappers
 
+import org.gradle.api.tasks.SourceSet
 import org.utbot.common.FileUtil.createNewFileWithParentDirectories
 import org.utbot.common.FileUtil.findAllFilesOnly
 import org.utbot.common.PathUtil.classFqnToPath
@@ -14,7 +15,6 @@ import java.io.File
 import java.net.URLClassLoader
 import java.nio.file.Path
 import java.nio.file.Paths
-import org.gradle.api.tasks.SourceSet
 
 class SourceSetWrapper(
     val sourceSet: SourceSet,

diff --git a/...tbot/sarif/wrappers/TargetClassWrapper.kt → ...dle/plugin/wrappers/TargetClassWrapper.kt b/...tbot/sarif/wrappers/TargetClassWrapper.kt → ...dle/plugin/wrappers/TargetClassWrapper.kt
@@ -1,4 +1,4 @@
-package org.utbot.sarif.wrappers
+package org.utbot.gradle.plugin.wrappers
 
 import org.utbot.framework.plugin.api.UtMethod
 import java.io.File

diff --git a/.../org/utbot/sarif/SarifGradlePluginTest.kt → ...ot/gradle/plugin/SarifGradlePluginTest.kt b/.../org/utbot/sarif/SarifGradlePluginTest.kt → ...ot/gradle/plugin/SarifGradlePluginTest.kt
@@ -1,4 +1,4 @@
-package org.utbot.sarif
+package org.utbot.gradle.plugin
 
 import org.junit.jupiter.api.Assertions.assertNotNull
 import org.junit.jupiter.api.Test

diff --git a/...in/org/utbot/sarif/SarifGradleTestUtil.kt → ...tbot/gradle/plugin/SarifGradleTestUtil.kt b/...in/org/utbot/sarif/SarifGradleTestUtil.kt → ...tbot/gradle/plugin/SarifGradleTestUtil.kt
@@ -1,4 +1,4 @@
-package org.utbot.sarif
+package org.utbot.gradle.plugin
 
 import org.gradle.api.Project
 import org.gradle.api.plugins.JavaPluginConvention
@@ -8,7 +8,7 @@ import org.gradle.testfixtures.ProjectBuilder
 internal fun buildProject(): Project {
     val project = ProjectBuilder.builder().build()
     project.pluginManager.apply("java")
-    project.pluginManager.apply("org.utbot.sarif")
+    project.pluginManager.apply("org.utbot.gradle.plugin")
     return project
 }
 

diff --git a/...nsion/SarifGradleExtensionProviderTest.kt → ...nsion/SarifGradleExtensionProviderTest.kt b/...nsion/SarifGradleExtensionProviderTest.kt → ...nsion/SarifGradleExtensionProviderTest.kt
@@ -1,27 +1,20 @@
-package org.utbot.sarif.extension
+package org.utbot.gradle.plugin.extension
 
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.DisplayName
+import org.junit.jupiter.api.Nested
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.assertThrows
+import org.mockito.Mockito
 import org.utbot.common.PathUtil.toPath
 import org.utbot.engine.Mocker
-import org.utbot.framework.codegen.ForceStaticMocking
-import org.utbot.framework.codegen.Junit4
-import org.utbot.framework.codegen.Junit5
-import org.utbot.framework.codegen.MockitoStaticMocking
-import org.utbot.framework.codegen.NoStaticMocking
-import org.utbot.framework.codegen.StaticsMocking
-import org.utbot.framework.codegen.TestFramework
-import org.utbot.framework.codegen.TestNg
+import org.utbot.framework.codegen.*
 import org.utbot.framework.plugin.api.ClassId
 import org.utbot.framework.plugin.api.CodegenLanguage
 import org.utbot.framework.plugin.api.MockFramework
 import org.utbot.framework.plugin.api.MockStrategyApi
-import org.utbot.sarif.buildProject
+import org.utbot.gradle.plugin.buildProject
 import java.io.File
-import org.junit.jupiter.api.Assertions.assertEquals
-import org.junit.jupiter.api.DisplayName
-import org.junit.jupiter.api.Nested
-import org.junit.jupiter.api.Test
-import org.junit.jupiter.api.assertThrows
-import org.mockito.Mockito
 
 class SarifGradleExtensionProviderTest {
 

diff --git a/...arif/wrappers/GradleProjectWrapperTest.kt → ...ugin/wrappers/GradleProjectWrapperTest.kt b/...arif/wrappers/GradleProjectWrapperTest.kt → ...ugin/wrappers/GradleProjectWrapperTest.kt
@@ -1,17 +1,15 @@
-package org.utbot.sarif.wrappers
+package org.utbot.gradle.plugin.wrappers
 
-import org.utbot.sarif.buildProject
-import org.utbot.sarif.extension.SarifGradleExtensionProvider
-import java.io.File
 import org.gradle.api.Project
 import org.gradle.api.tasks.SourceSet
-import org.junit.jupiter.api.Assertions.assertEquals
-import org.junit.jupiter.api.Assertions.assertNotNull
-import org.junit.jupiter.api.Assertions.assertNull
+import org.junit.jupiter.api.Assertions.*
 import org.junit.jupiter.api.DisplayName
 import org.junit.jupiter.api.Nested
 import org.junit.jupiter.api.Test
 import org.mockito.Mockito
+import org.utbot.gradle.plugin.buildProject
+import org.utbot.gradle.plugin.extension.SarifGradleExtensionProvider
+import java.io.File
 
 class GradleProjectWrapperTest {
 

diff --git a/...appers/SourceFindingStrategyGradleTest.kt → ...appers/SourceFindingStrategyGradleTest.kt b/...appers/SourceFindingStrategyGradleTest.kt → ...appers/SourceFindingStrategyGradleTest.kt
@@ -1,12 +1,12 @@
-package org.utbot.sarif.wrappers
+package org.utbot.gradle.plugin.wrappers
 
-import org.utbot.common.PathUtil.toPath
-import java.nio.file.Paths
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.DisplayName
 import org.junit.jupiter.api.Nested
 import org.junit.jupiter.api.Test
 import org.mockito.Mockito
+import org.utbot.common.PathUtil.toPath
+import java.nio.file.Paths
 
 class SourceFindingStrategyGradleTest {
 

diff --git a/...ot/sarif/wrappers/SourceSetWrapperTest.kt → ...e/plugin/wrappers/SourceSetWrapperTest.kt b/...ot/sarif/wrappers/SourceSetWrapperTest.kt → ...e/plugin/wrappers/SourceSetWrapperTest.kt
@@ -1,20 +1,19 @@
-package org.utbot.sarif.wrappers
+package org.utbot.gradle.plugin.wrappers
 
-import org.utbot.common.FileUtil.createNewFileWithParentDirectories
-import org.utbot.framework.plugin.api.CodegenLanguage
-import org.utbot.framework.util.*
-import org.utbot.sarif.buildProject
-import org.utbot.sarif.extension.SarifGradleExtensionProvider
-import org.utbot.sarif.mainSourceSet
-import java.nio.file.Paths
 import org.gradle.api.Project
-import org.junit.jupiter.api.Assertions.assertEquals
-import org.junit.jupiter.api.Assertions.assertNotNull
-import org.junit.jupiter.api.Assertions.assertNull
+import org.junit.jupiter.api.Assertions.*
 import org.junit.jupiter.api.DisplayName
 import org.junit.jupiter.api.Nested
 import org.junit.jupiter.api.Test
 import org.mockito.Mockito
+import org.utbot.common.FileUtil.createNewFileWithParentDirectories
+import org.utbot.framework.plugin.api.CodegenLanguage
+import org.utbot.framework.util.Snippet
+import org.utbot.framework.util.compileClassFile
+import org.utbot.gradle.plugin.buildProject
+import org.utbot.gradle.plugin.extension.SarifGradleExtensionProvider
+import org.utbot.gradle.plugin.mainSourceSet
+import java.nio.file.Paths
 
 class SourceSetWrapperTest {