diff --git a/.gitignore b/.gitignore index 570a9de..f445cb6 100644 --- a/.gitignore +++ b/.gitignore @@ -7,4 +7,5 @@ build */build/ #gradle.properties local.yml +ts-gradle/local.properties !.idea/codeStyles \ No newline at end of file diff --git a/ts-gradle/src/main/kotlin/Utils.kt b/ts-gradle/src/main/kotlin/Utils.kt index c467533..09285ee 100644 --- a/ts-gradle/src/main/kotlin/Utils.kt +++ b/ts-gradle/src/main/kotlin/Utils.kt @@ -1,5 +1,6 @@ +import org.gradle.api.DomainObjectCollection import org.gradle.api.Project -import org.gradle.api.artifacts.ConfigurationContainer +import org.gradle.api.artifacts.Configuration import org.gradle.api.publish.PublishingExtension import org.gradle.api.publish.maven.MavenPublication import java.util.concurrent.TimeUnit @@ -45,7 +46,7 @@ fun Project.publish(publish: PublishingExtension) { println("cannot publish to repository tursom:\n${e.javaClass}: ${e.message}") } - val repositoriesRegex = "repositories\\.[a-zA-z][a-zA-z0-9]*".toRegex() + val repositoriesRegex = "publishRepositories\\.[a-zA-z][a-zA-z0-9]*".toRegex() properties.keys.asSequence().filter { it matches repositoriesRegex }.forEach { repositoryName -> @@ -102,7 +103,7 @@ fun Project.publish(publish: PublishingExtension) { } } -fun ConfigurationContainer.noExpire() { +fun DomainObjectCollection<Configuration>.noExpire() { all { it.resolutionStrategy.cacheChangingModulesFor(0, TimeUnit.SECONDS) it.resolutionStrategy.cacheDynamicVersionsFor(0, TimeUnit.SECONDS) @@ -129,4 +130,8 @@ fun Project.userTursomRepositories( } } } + try { + configurations.noExpire() + } catch (e: Exception) { + } }