Align default cache state with Gradle

Sergey Chelombitko · Sergey Chelombitko · commit 7a82842d3995 · 2024-12-18T15:03:56.000Z
diff --git a/marathon-gradle-plugin/src/main/kotlin/com/malinskiy/marathon/CachePluginConfiguration.kt b/marathon-gradle-plugin/src/main/kotlin/com/malinskiy/marathon/CachePluginConfiguration.kt
@@ -41,9 +41,9 @@ interface RemoteCacheExtension {
 }
 
 internal fun CachePluginConfiguration.initDefaults() {
-    local.enabled.convention(false)
+    local.enabled.convention(true)
     local.removeUnusedEntriesAfterDays.convention(7)
-    remote.enabled.convention(false)
+    remote.enabled.convention(true)
     remote.push.convention(true)
 }
 
@@ -54,14 +54,14 @@ internal fun CachePluginConfiguration.toCacheConfiguration(): CacheConfiguration
     )
 
 private fun LocalCacheExtension.toConfig(): LocalCacheConfiguration =
-    if (enabled.get()) {
+    if (directory.isPresent && enabled.get()) {
         LocalCacheConfiguration.Enabled(directory.get().asFile, removeUnusedEntriesAfterDays.get())
     } else {
         LocalCacheConfiguration.Disabled
     }
 
 private fun RemoteCacheExtension.toConfig(): RemoteCacheConfiguration =
-    if (enabled.get()) {
+    if (url.isPresent && enabled.get()) {
         RemoteCacheConfiguration.Enabled(
             url = url.get(),
             credentials = credentials.orNull?.toCredentials(),

Original file line number	Diff line number	Diff line change
`@@ -41,9 +41,9 @@ interface RemoteCacheExtension {`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`internal fun CachePluginConfiguration.initDefaults() {`
`44`		`- local.enabled.convention(false)`
	`44`	`+ local.enabled.convention(true)`
`45`	`45`	`local.removeUnusedEntriesAfterDays.convention(7)`
`46`		`- remote.enabled.convention(false)`
	`46`	`+ remote.enabled.convention(true)`
`47`	`47`	`remote.push.convention(true)`
`48`	`48`	`}`
`49`	`49`
`@@ -54,14 +54,14 @@ internal fun CachePluginConfiguration.toCacheConfiguration(): CacheConfiguration`
`54`	`54`	`)`
`55`	`55`
`56`	`56`	`private fun LocalCacheExtension.toConfig(): LocalCacheConfiguration =`
`57`		`- if (enabled.get()) {`
	`57`	`+ if (directory.isPresent && enabled.get()) {`
`58`	`58`	`LocalCacheConfiguration.Enabled(directory.get().asFile, removeUnusedEntriesAfterDays.get())`
`59`	`59`	`} else {`
`60`	`60`	`LocalCacheConfiguration.Disabled`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`private fun RemoteCacheExtension.toConfig(): RemoteCacheConfiguration =`
`64`		`- if (enabled.get()) {`
	`64`	`+ if (url.isPresent && enabled.get()) {`
`65`	`65`	`RemoteCacheConfiguration.Enabled(`
`66`	`66`	`url = url.get(),`
`67`	`67`	`credentials = credentials.orNull?.toCredentials(),`