[HotFix] Release/1.0.0-beta9 (#120)

.circleci/config.yml

@@ -42,10 +42,37 @@ jobs:
       - run:
           name: publish
           command: ./gradlew publishToGradlePortal --info --stacktrace
+  deploy-docs:
+    machine:
+      image: ubuntu-2004:202201-02
+    steps:
+      - checkout
+      - run:
+          name: deploy-docs
+          command: |
+            printf "\n\n\n --------- update apt --------- \n"
+            sudo apt update
+            printf "\n\n\n --------- install python3 ---------- \n"
+            sudo apt install python3-pip
+            pip3 --version
+            printf "\n\n\n --------- install git --------- \n"
+            sudo apt install git
+            printf "\n\n\n --------- install mkdocs -------- \n"
+            pip3 install mkdocs
+            mkdocs --version
+            printf "\n\n\n --------- install mkdocs-material --------- \n"
+            pip3 install mkdocs-material
+            printf "\n\n\n --------- deploy --------- \n"
+            mkdocs gh-deploy
 workflows:
   build-workflow:
     jobs:
       - build
+      - deploy-docs:
+          filters:
+            branches:
+              only:
+                - main
       - publish:
           filters:
             branches:

docs/changelog.md

@@ -23,6 +23,9 @@
 
 # Changelog
 
+## 1.0.0-beta9
+* Fix critical issues
+
 ## 1.0.0-beta8
 * [Feature 81](https://github.com/janbarari/gradle-analytics-plugin/issues/81)
 * Used/Available worker count added in console report

docs/setup.md

@@ -38,13 +38,13 @@ Apply the Gradle Plugin to the root of your project.
 === "Kotlin"
     ``` kotlin
     plugins {
-        id("io.github.janbarari.gradle-analytics-plugin") version "1.0.0-beta8"
+        id("io.github.janbarari.gradle-analytics-plugin") version "1.0.0-beta9"
     }
     ```
 === "Groovy"
     ``` groovy
     plugins {
-        id 'io.github.janbarari.gradle-analytics-plugin' version '1.0.0-beta8'
+        id 'io.github.janbarari.gradle-analytics-plugin' version '1.0.0-beta9'
     }
     ```
 [For legacy plugin application, see the Gradle Plugin Portal.](https://plugins.gradle.org/plugin/io.github.janbarari.gradle-analytics-plugin)
@@ -56,7 +56,7 @@ Add plugin configuration in the root of your project.
 === "Kotlin"
     ``` kotlin
     gradleAnalyticsPlugin {
-        isEnabled = true // Optional: By default it's True.
+        enabled = true // Optional: By default it's True.
 
         database {
             local = sqlite {
@@ -90,15 +90,15 @@ Add plugin configuration in the root of your project.
         // Optional: Exclude modules that are not necessary like test or demo modules
         excludeModules = setOf()
 
-        isTrackAllBranchesEnabled = false // Optional: Default is False.
+        trackAllBranchesEnabled = false // Optional: Default is False.
 
         outputPath = "OUTPUT_REPORT_PATH" // Optional: Default is project /build/ dir.
     }
     ```
 === "Groovy"
     ``` groovy
     gradleAnalyticsPlugin {
-        isEnabled = true // Optional: By default it's True.
+        enabled = true // Optional: By default it's True.
 
         database {
             local = sqlite {
@@ -132,7 +132,7 @@ Add plugin configuration in the root of your project.
         // Optional: Exclude modules that are not necessary like test or demo modules
         excludeModules = []
 
-        isTrackAllBranchesEnabled = false // Optional: Default is False.
+        trackAllBranchesEnabled = false // Optional: Default is False.
 
         outputPath = 'OUTPUT_REPORT_PATH' // Optional: Default is project /build/ dir.
     }

gradle.properties

@@ -31,4 +31,4 @@ pluginTags = kotlin,plugin,analytics,analysis,gradle,gradle-plugin,gradle-plugin
 pluginImplementationClass = io.github.janbarari.gradle.analytics.GradleAnalyticsPlugin
 pluginDeclarationName = gradleAnalyticsPlugin
 pluginGroupPackageName = io.github.janbarari
-pluginVersion = 1.0.0-beta8
+pluginVersion = 1.0.0-beta9

src/main/kotlin/io/github/janbarari/gradle/analytics/GradleAnalyticsPlugin.kt

@@ -54,7 +54,7 @@ class GradleAnalyticsPlugin @Inject constructor(
 
     companion object {
         const val PLUGIN_NAME = "gradleAnalyticsPlugin"
-        const val PLUGIN_VERSION = "1.0.0-beta8"
+        const val PLUGIN_VERSION = "1.0.0-beta9"
         const val OUTPUT_DIRECTORY_NAME = "gradle-analytics-plugin"
     }
 

src/main/kotlin/io/github/janbarari/gradle/analytics/GradleAnalyticsPluginConfig.kt

@@ -34,7 +34,7 @@ open class GradleAnalyticsPluginConfig(val project: Project) {
 
     private var databaseConfig: DatabaseConfig = DatabaseConfig()
 
-    var isEnabled: Boolean = true
+    var enabled: Boolean = true
 
     var trackingTasks: Set<String> = setOf()
 
@@ -46,7 +46,7 @@ open class GradleAnalyticsPluginConfig(val project: Project) {
      * Tracing all branches has disabled by default during to the significant drawback
      * it creates in the database, especially for temporary branches.
      */
-    var isTrackAllBranchesEnabled: Boolean = false
+    var trackAllBranchesEnabled: Boolean = false
 
     var outputPath: String = project.rootProject.buildDir.absolutePath
 

src/main/kotlin/io/github/janbarari/gradle/analytics/domain/model/metric/BuildMetric.kt

@@ -102,7 +102,7 @@ data class BuildMetric(
     var modulesTimelineMetric: ModulesTimelineMetric? = null
 
     @Transient
-    var gradleWorkers: Pair<Int, Int> = 0 to 0
+    var maximumWorkerCount: Int = 0
 
     fun getLog(): String {
         return buildString {

src/main/kotlin/io/github/janbarari/gradle/analytics/scanner/BuildScanner.kt

@@ -39,7 +39,6 @@ import io.github.janbarari.gradle.utils.DependencyGraphGenerator
 import org.gradle.api.Project
 import org.gradle.api.internal.GradleInternal
 import org.gradle.build.event.BuildEventsListenerRegistry
-import oshi.SystemInfo
 import java.util.*
 
 @ExcludeJacocoGenerated
@@ -60,9 +59,7 @@ object BuildScanner {
         registry: BuildEventsListenerRegistry,
         configuration: GradleAnalyticsPluginConfig
     ) {
-        val systemProcessor = SystemInfo().hardware.processor
-        val availableWorkerCount = project.gradle.startParameter.maxWorkerCount
-        val maximumWorkerCount = systemProcessor.logicalProcessorCount + systemProcessor.physicalProcessorCount
+        val maximumWorkerCount = project.gradle.startParameter.maxWorkerCount
 
         project.gradle.projectsEvaluated {
             val nonCacheableTasks = Collections.synchronizedList(mutableListOf<String>())
@@ -84,16 +81,15 @@ object BuildScanner {
                 BuildExecutionService::class.java
             ) { spec ->
                 with(spec.parameters) {
-                    enabled.set(configuration.isEnabled)
+                    enabled.set(configuration.enabled)
                     databaseConfig.set(configuration.getDatabaseConfig())
                     envCI.set(envCI())
                     requestedTasks.set(project.gradle.getRequestedTasks())
                     trackingTasks.set(configuration.trackingTasks)
                     trackingBranches.set(configuration.trackingBranches)
-                    trackAllBranchesEnabled.set(configuration.isTrackAllBranchesEnabled)
+                    trackAllBranchesEnabled.set(configuration.trackAllBranchesEnabled)
                     outputPath.set(configuration.outputPath)
                     this.maximumWorkerCount.set(maximumWorkerCount)
-                    this.availableWorkerCount.set(availableWorkerCount)
                     this.modules.set(modules)
                     this.modulesDependencyGraph.set(modulesDependencyGraph)
                     this.nonCacheableTasks.set(nonCacheableTasks)

src/main/kotlin/io/github/janbarari/gradle/analytics/scanner/execution/BuildExecutionInjector.kt

@@ -513,7 +513,7 @@ fun BuildExecutionInjector.provideBuildExecutionLogic(): BuildExecutionLogic {
         tower = provideTower(),
         requestedTasks = parameters.requestedTasks.get(),
         modules = parameters.modules.get(),
-        gradleWorker = parameters.availableWorkerCount.get() to parameters.maximumWorkerCount.get(),
+        maximumWorkerCount = parameters.maximumWorkerCount.get(),
         saveMetricUseCase = provideSaveMetricUseCase(),
         saveTemporaryMetricUseCase = provideSaveTemporaryMetricUseCase(),
         upsertModulesTimelineUseCase = provideUpsertModulesTimelineUseCase(),

src/main/kotlin/io/github/janbarari/gradle/analytics/scanner/execution/BuildExecutionLogicImp.kt

@@ -82,7 +82,7 @@ class BuildExecutionLogicImp(
     private val tower: Tower,
     private val requestedTasks: List<String>,
     private val modules: Set<Module>,
-    private val gradleWorker: Pair<Int, Int>,
+    private val maximumWorkerCount: Int,
     private val saveMetricUseCase: SaveMetricUseCase,
     private val saveTemporaryMetricUseCase: SaveTemporaryMetricUseCase,
     private val upsertModulesTimelineUseCase: UpsertModulesTimelineUseCase,
@@ -171,7 +171,7 @@ class BuildExecutionLogicImp(
                 )
             )
 
-        buildMetric.gradleWorkers = gradleWorker
+        buildMetric.maximumWorkerCount = maximumWorkerCount
 
         saveTemporaryMetricUseCase.execute(buildMetric)
         saveMetricUseCase.execute(buildMetric)
@@ -209,10 +209,7 @@ class BuildExecutionLogicImp(
             printLine(left = "Overall Build Process:", right = "${buildMetric.overallBuildProcessMetric?.median}ms")
             printLine(left = "Cache Hit:", right = "${buildMetric.cacheHitMetric?.rate}%")
             printLine(left = "Parallel Execution Rate:", right = "${buildMetric.parallelExecutionRateMetric?.medianRate}%")
-            printLine(
-                left = "Used/Available Worker Count:",
-                right = "${buildMetric.gradleWorkers.first}/${buildMetric.gradleWorkers.second}"
-            )
+            printLine(left = "Maximum Worker Count:", right = "${buildMetric.maximumWorkerCount}")
             printBreakLine(char = '-')
             printLine(left = "Datetime:", right = DateTimeUtils.formatToDateTime(buildMetric.createdAt))
             printBreakLine(char = '-')

src/main/kotlin/io/github/janbarari/gradle/analytics/scanner/execution/BuildExecutionService.kt

@@ -83,7 +83,6 @@ abstract class BuildExecutionService : BuildService<BuildExecutionService.Params
         val modulesDependencyGraph: Property<ModulesDependencyGraph>
         val nonCacheableTasks: SetProperty<String>
         val outputPath: Property<String>
-        val availableWorkerCount: Property<Int>
         val maximumWorkerCount: Property<Int>
     }
 
@@ -181,8 +180,7 @@ abstract class BuildExecutionService : BuildService<BuildExecutionService.Params
         tower.r("ci: ${parameters.envCI.get()}")
         tower.r("tracking tasks count: ${parameters.trackingTasks.get().size}")
         tower.r("tracking branches count: ${parameters.trackingBranches.get().size}")
-        tower.r("available/maximum worker count: " +
-                "${parameters.availableWorkerCount.get()}/${parameters.maximumWorkerCount.get()}")
+        tower.r("maximum worker count: " + "${parameters.maximumWorkerCount.get()}")
 
         printConfigurationNotices()
 

src/test/kotlin/io/github/janbarari/gradle/analytics/scanner/BuildExecutionLogicTest.kt

@@ -72,8 +72,6 @@ class BuildExecutionLogicTest {
             override val nonCacheableTasks: SetProperty<String>
                 get() = MockSetProperty(mutableSetOf())
             override val outputPath: Property<String> = MockProperty("./build")
-            override val availableWorkerCount: Property<Int>
-                get() = MockProperty(0)
             override val maximumWorkerCount: Property<Int>
                 get() = MockProperty(0)
         }