Remove RepositoriesPresetDependenciesResolver

Kotlin · Nov 17, 2019 · fdf1a3d · fdf1a3d
1 parent 1394279
commit fdf1a3d
Showing 1 changed file with 1 addition and 11 deletions.
diff --git a/src/main/kotlin/org/jetbrains/kotlin/jupyter/resolver.kt b/src/main/kotlin/org/jetbrains/kotlin/jupyter/resolver.kt
@@ -27,24 +27,14 @@ class AliasDependenciesResolver(private val baseResolver: ExternalDependenciesRe
             artifactsMapping.containsKey(artifactCoordinates) || baseResolver.acceptsArtifact(artifactCoordinates)
 }
 
-class RepositoriesPresetDependenciesResolver(private val baseResolver: ExternalDependenciesResolver, repositories: Iterable<RepositoryCoordinates>)
-    : ExternalDependenciesResolver by baseResolver {
-
-    init {
-        repositories.forEach {
-            baseResolver.tryAddRepository(it)
-        }
-    }
-}
-
 open class JupyterScriptDependenciesResolver(val resolverConfig: ResolverConfig?) {
     private val resolver: ExternalDependenciesResolver
 
     init {
         var r: ExternalDependenciesResolver = CompoundDependenciesResolver(FileSystemDependenciesResolver(), MavenDependenciesResolver())
         if (resolverConfig != null) {
-            if (resolverConfig.repositories.isNotEmpty()) r = RepositoriesPresetDependenciesResolver(r, resolverConfig.repositories)
             if (resolverConfig.libraries.isNotEmpty()) r = AliasDependenciesResolver(r, resolverConfig.libraries.mapValues { it.value.artifacts })
+            resolverConfig.repositories.forEach { r.tryAddRepository(it) }
         }
         resolver = r
     }