Prechádzať zdrojové kódy

replaced MavenArtifactRepository with ArtifactRepository

sirekanian 2 rokov pred
rodič
commit
3cc48b2921

+ 1 - 5
src/main/kotlin/com/sirekanyan/bump/BumpPlugin.kt

@@ -5,7 +5,6 @@ import org.gradle.api.Project
 import org.gradle.api.artifacts.ConfigurationContainer
 import org.gradle.api.artifacts.Dependency
 import org.gradle.api.artifacts.dsl.RepositoryHandler
-import org.gradle.api.artifacts.repositories.MavenArtifactRepository
 import org.gradle.kotlin.dsl.create
 
 class BumpPlugin : Plugin<Project> {
@@ -37,7 +36,7 @@ class BumpPlugin : Plugin<Project> {
         configurationContainer: ConfigurationContainer,
         configurationName: String,
     ) {
-        val repositories = repositoryHandler.getMavenRepositories()
+        val repositories = repositoryHandler.toList()
         val dependencies = configurationContainer.getDependencies(configurationName)
         val checker = VersionChecker(extension, repositories, dependencies)
         checker.fetchMetadata()
@@ -51,9 +50,6 @@ class BumpPlugin : Plugin<Project> {
         }
     }
 
-    private fun RepositoryHandler.getMavenRepositories(): List<MavenArtifactRepository> =
-        map { (it as MavenArtifactRepository) }
-
     private fun ConfigurationContainer.getDependencies(name: String): List<Dependency> =
         getByName(name).allDependencies.toList()
 

+ 3 - 3
src/main/kotlin/com/sirekanyan/bump/VersionChecker.kt

@@ -15,12 +15,12 @@ import io.ktor.client.statement.*
 import io.ktor.http.*
 import kotlinx.coroutines.*
 import org.gradle.api.artifacts.Dependency
-import org.gradle.api.artifacts.repositories.MavenArtifactRepository
+import org.gradle.api.artifacts.repositories.ArtifactRepository
 import java.io.File
 
 class VersionChecker(
     private val extension: BumpExtension,
-    private val repositories: List<MavenArtifactRepository>,
+    private val repositories: List<ArtifactRepository>,
     dependencies: List<Dependency>,
 ) {
 
@@ -69,7 +69,7 @@ class VersionChecker(
         repositories.flatMap { getVersions(it, dependency) }.maxOrNull() ?: Version.ZERO
 
     private fun getVersions(
-        repository: MavenArtifactRepository,
+        repository: ArtifactRepository,
         dependency: Dependency,
     ): List<Version> {
         val response = metadataCache.getValue(createArtifactKey(repository, dependency)) ?: return listOf()

+ 3 - 2
src/main/kotlin/com/sirekanyan/bump/model/ArtifactKey.kt

@@ -1,10 +1,11 @@
 package com.sirekanyan.bump.model
 
 import org.gradle.api.artifacts.Dependency
+import org.gradle.api.artifacts.repositories.ArtifactRepository
 import org.gradle.api.artifacts.repositories.MavenArtifactRepository
 
-fun createArtifactKey(repository: MavenArtifactRepository, dependency: Dependency): ArtifactKey {
-    val repositoryUrl = repository.url.toASCIIString().removeSuffix("/")
+fun createArtifactKey(repository: ArtifactRepository, dependency: Dependency): ArtifactKey {
+    val repositoryUrl = (repository as MavenArtifactRepository).url.toASCIIString().removeSuffix("/")
     val groupPath = checkNotNull(dependency.group).replace('.', '/')
     val namePath = dependency.name.replace('.', '/')
     val url = "$repositoryUrl/$groupPath/$namePath/maven-metadata.xml"