From ae6258acb813c7c5105d0fbd870909836ca52e3a Mon Sep 17 00:00:00 2001 From: Juan Liska Date: Fri, 29 Mar 2019 08:00:48 -0600 Subject: [PATCH] use https to fetch artifacts --- kobalt/src/Build.kt | 10 +++++----- .../src/main/kotlin/com/beust/kobalt/Constants.kt | 4 ++-- .../main/kotlin/com/beust/kobalt/internal/DocUrl.kt | 2 +- .../beust/kobalt/maven/aether/KobaltMavenResolver.kt | 2 +- .../com/beust/kobalt/misc/KobaltWrapperProperties.kt | 2 +- .../src/main/java/com/beust/kobalt/wrapper/Main.java | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/kobalt/src/Build.kt b/kobalt/src/Build.kt index ff15cc4c..0d09844a 100644 --- a/kobalt/src/Build.kt +++ b/kobalt/src/Build.kt @@ -21,7 +21,7 @@ import java.util.zip.ZipEntry import java.util.zip.ZipOutputStream val bs = buildScript { - repos("http://dl.bintray.com/cbeust/maven") + repos("https://dl.bintray.com/cbeust/maven") } object Versions { @@ -92,7 +92,7 @@ val kobaltPluginApi = project { version = readVersion() directory = "modules/kobalt-plugin-api" description = "A build system in Kotlin" - url = "http://beust.com/kobalt" + url = "https://beust.com/kobalt" pom = createPom(name, "A build system in Kotlin") @@ -309,13 +309,13 @@ fun taskCopyVersionForWrapper(project: Project) : TaskResult { fun createPom(projectName: String, projectDescription: String) = Model().apply { name = projectName description = projectDescription - url = "http://beust.com/kobalt" + url = "https://beust.com/kobalt" licenses = listOf(License().apply { name = "Apache-2.0" - url = "http://www.apache.org/licenses/LICENSE-2.0" + url = "https://www.apache.org/licenses/LICENSE-2.0" }) scm = Scm().apply { - url = "http://github.com/cbeust/kobalt" + url = "https://github.com/cbeust/kobalt" connection = "https://github.com/cbeust/kobalt.git" developerConnection = "git@github.com:cbeust/kobalt.git" } diff --git a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/Constants.kt b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/Constants.kt index 053d0b92..8eb73c84 100644 --- a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/Constants.kt +++ b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/Constants.kt @@ -13,9 +13,9 @@ object Constants { internal val DEFAULT_REPOS = listOf( // "https://maven-central.storage.googleapis.com/", - HostConfig("http://repo1.maven.org/maven2/", "Maven"), + HostConfig("https://repo1.maven.org/maven2/", "Maven"), HostConfig("https://jcenter.bintray.com/", "JCenter") -// "http://repository.jetbrains.com/all/", // <-- contains snapshots +// "https://repository.jetbrains.com/all/", // <-- contains snapshots // snapshots // "https://oss.sonatype.org/content/repositories/snapshots/" diff --git a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/DocUrl.kt b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/DocUrl.kt index 8acab0ab..93010294 100644 --- a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/DocUrl.kt +++ b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/DocUrl.kt @@ -2,7 +2,7 @@ package com.beust.kobalt.internal class DocUrl { companion object { - private const val HOST = "http://beust.com/kobalt/" + private const val HOST = "https://beust.com/kobalt/" private fun url(path: String) = HOST + path val PUBLISH_PLUGIN_URL = url("plug-ins/index.html#publishing") diff --git a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/maven/aether/KobaltMavenResolver.kt b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/maven/aether/KobaltMavenResolver.kt index f5fcde59..7c8b705f 100644 --- a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/maven/aether/KobaltMavenResolver.kt +++ b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/maven/aether/KobaltMavenResolver.kt @@ -52,7 +52,7 @@ class KobaltMavenResolver @Inject constructor(val settings: KobaltSettings, } fun error(s1: String, s2: String) { throw KobaltException("Found \"$s1\" but not \"$s2\" in local.properties for ${Kurl.KEY}.$host", - docUrl = "http://beust.com/kobalt/documentation/index.html#maven-repos-authenticated") + docUrl = "https://beust.com/kobalt/documentation/index.html#maven-repos-authenticated") } if (! hostInfo.username.isNullOrBlank() && hostInfo.password.isNullOrBlank()) { error("username", "password") diff --git a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/misc/KobaltWrapperProperties.kt b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/misc/KobaltWrapperProperties.kt index 06d01e7b..a7b5177d 100644 --- a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/misc/KobaltWrapperProperties.kt +++ b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/misc/KobaltWrapperProperties.kt @@ -24,7 +24,7 @@ class KobaltWrapperProperties @Inject constructor() { } private fun defaultUrlFor(version: String) = - "http://beust.com/kobalt/kobalt-$version.zip" + "https://beust.com/kobalt/kobalt-$version.zip" private val file: File get() = File("$WRAPPER_DIR/$KOBALT_WRAPPER_PROPERTIES") diff --git a/modules/wrapper/src/main/java/com/beust/kobalt/wrapper/Main.java b/modules/wrapper/src/main/java/com/beust/kobalt/wrapper/Main.java index 40e21ea5..f31bbc3f 100644 --- a/modules/wrapper/src/main/java/com/beust/kobalt/wrapper/Main.java +++ b/modules/wrapper/src/main/java/com/beust/kobalt/wrapper/Main.java @@ -118,7 +118,7 @@ public class Main { } private static String downloadUrl(String version) { - return "http://beust.com/kobalt/kobalt-" + version + ".zip"; + return "https://beust.com/kobalt/kobalt-" + version + ".zip"; } private void initWrapperFile(String version) throws IOException {