Merge pull request #1 from MarathonLabs/feature/0.10.1

chore(gradle-plugin): update to 0.10.1
MarathonLabs · May 10, 2024 · 84d8f12 · 84d8f12
2 parents 608736d + 4deda9a
commit 84d8f12
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -12,17 +12,13 @@ jobs:
           java-version: '11'
       - name: test
         run: |
-          chmod 0600 $GITHUB_WORKSPACE/vendor/vendor-apple/base/src/test/resources/fixtures/derived-data-manager/test_rsa
-          ./gradlew clean test jacocoTestReport integrationTest
+          ./gradlew clean test
           bash <(curl -s https://codecov.io/bash)
       - name: Publish Test Report
         uses: mikepenz/action-junit-report@v3
         if: always()
         with:
           report_paths: '**/build/test-results/test/TEST-*.xml'
-      - name: detekt
-        run: |
-          ./gradlew clean detektCheck || true
       - name: validateGradlePlugins
         run: |
           ./gradlew validatePlugins

diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt
@@ -13,7 +13,6 @@ object Versions {
 
     val junit5 = "5.10.1"
 
-    val gson = "2.10.1"
     val apacheCommonsCodec = "1.15"
     val jupiterEngine = junit5
     val dokka = "1.9.10"
@@ -30,7 +29,6 @@ object BuildPlugins {
 object Libraries {
     val configuration = "com.malinskiy.marathon:configuration:${Versions.marathon}"
     val kotlinLogging = "io.github.microutils:kotlin-logging:${Versions.kotlinLogging}"
-    val gson = "com.google.code.gson:gson:${Versions.gson}"
     val apacheCommonsCodec = "commons-codec:commons-codec:${Versions.apacheCommonsCodec}"
 }
 

diff --git a/...dle-plugin/src/main/kotlin/com/malinskiy/marathon/gradle/configuration/AnalyticsConfig.kt b/...dle-plugin/src/main/kotlin/com/malinskiy/marathon/gradle/configuration/AnalyticsConfig.kt
@@ -37,6 +37,7 @@ class InfluxConfig {
     var dbName: String = ""
     var retentionPolicy: RetentionPolicy? = null
     var defaults: Defaults = Defaults()
+    val readOnly: Boolean = false
 }
 
 class Influx2Config {
@@ -46,6 +47,7 @@ class Influx2Config {
     var bucket: String = ""
     var retentionPolicy: Influx2RetentionPolicy? = null
     var defaults: Defaults = Defaults()
+    val readOnly: Boolean = false
 }
 
 class Influx2RetentionPolicy {
@@ -66,6 +68,7 @@ class GraphiteConfig {
     var port: String? = null
     var prefix: String? = null
     var defaults: Defaults = Defaults()
+    val readOnly: Boolean = false
 }
 
 fun AnalyticsConfig.toAnalyticsConfiguration(): AnalyticsConfiguration {
@@ -80,7 +83,8 @@ fun AnalyticsConfig.toAnalyticsConfiguration(): AnalyticsConfiguration {
             bucket = influx2.bucket,
             retentionPolicyConfiguration = influx2.retentionPolicy?.toRetentionPolicy()
                 ?: AnalyticsConfiguration.InfluxDb2Configuration.RetentionPolicyConfiguration.default,
-            defaults = influx2.defaults
+            defaults = influx2.defaults,
+            readOnly = influx2.readOnly,
         )
         influx != null -> AnalyticsConfiguration.InfluxDbConfiguration(
             dbName = influx.dbName,
@@ -89,13 +93,15 @@ fun AnalyticsConfig.toAnalyticsConfiguration(): AnalyticsConfiguration {
             url = influx.url,
             retentionPolicyConfiguration = influx.retentionPolicy?.toRetentionPolicy()
                 ?: AnalyticsConfiguration.InfluxDbConfiguration.RetentionPolicyConfiguration.default,
-            defaults = influx.defaults
+            defaults = influx.defaults,
+            readOnly = influx.readOnly,
         )
         graphite != null -> AnalyticsConfiguration.GraphiteConfiguration(
             host = graphite.host,
             port = graphite.port?.toIntOrNull(),
             prefix = graphite.prefix,
-            defaults = graphite.defaults
+            defaults = graphite.defaults,
+            readOnly = graphite.readOnly,
         )
         else -> AnalyticsConfiguration.DisabledAnalytics
     }