erik/kobalt
erik/kobalt
1
0
Fork 0
mirror of https://github.com/ethauvin/kobalt.git synced 2025-04-24 23:47:11 -07:00
Code Releases Activity

use https to fetch artifacts

Browse source
This commit is contained in:
Juan Liska 2019-03-29 08:00:48 -06:00
parent 4644b66d79
commit ae6258acb8
6 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

10
kobalt/src/Build.kt
View file

@ -21,7 +21,7 @@ import java.util.zip.ZipEntry
import java.util.zip.ZipOutputStream import java.util.zip.ZipOutputStream
val bs = buildScript { val bs = buildScript {
repos("http://dl.bintray.com/cbeust/maven") repos("https://dl.bintray.com/cbeust/maven")
} }
object Versions { object Versions {
@ -92,7 +92,7 @@ val kobaltPluginApi = project {
version = readVersion() version = readVersion()
directory = "modules/kobalt-plugin-api" directory = "modules/kobalt-plugin-api"
description = "A build system in Kotlin" description = "A build system in Kotlin"
url = "http://beust.com/kobalt" url = "https://beust.com/kobalt"
pom = createPom(name, "A build system in Kotlin") 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 { fun createPom(projectName: String, projectDescription: String) = Model().apply {
name = projectName name = projectName
description = projectDescription description = projectDescription
url = "http://beust.com/kobalt" url = "https://beust.com/kobalt"
licenses = listOf(License().apply { licenses = listOf(License().apply {
name = "Apache-2.0" 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 { scm = Scm().apply {
url = "http://github.com/cbeust/kobalt" url = "https://github.com/cbeust/kobalt"
connection = "https://github.com/cbeust/kobalt.git" connection = "https://github.com/cbeust/kobalt.git"
developerConnection = "git@github.com:cbeust/kobalt.git" developerConnection = "git@github.com:cbeust/kobalt.git"
} }

4
modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/Constants.kt
View file

@ -13,9 +13,9 @@ object Constants {
internal val DEFAULT_REPOS = listOf<HostConfig>( internal val DEFAULT_REPOS = listOf<HostConfig>(
// "https://maven-central.storage.googleapis.com/", // "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") HostConfig("https://jcenter.bintray.com/", "JCenter")
// "http://repository.jetbrains.com/all/", // <-- contains snapshots // "https://repository.jetbrains.com/all/", // <-- contains snapshots
// snapshots // snapshots
// "https://oss.sonatype.org/content/repositories/snapshots/" // "https://oss.sonatype.org/content/repositories/snapshots/"

2
modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/DocUrl.kt
View file

@ -2,7 +2,7 @@ package com.beust.kobalt.internal
class DocUrl { class DocUrl {
companion object { 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 private fun url(path: String) = HOST + path
val PUBLISH_PLUGIN_URL = url("plug-ins/index.html#publishing") val PUBLISH_PLUGIN_URL = url("plug-ins/index.html#publishing")

2
modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/maven/aether/KobaltMavenResolver.kt
View file

@ -52,7 +52,7 @@ class KobaltMavenResolver @Inject constructor(val settings: KobaltSettings,
} }
fun error(s1: String, s2: String) { fun error(s1: String, s2: String) {
throw KobaltException("Found \"$s1\" but not \"$s2\" in local.properties for ${Kurl.KEY}.$host", 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()) { if (! hostInfo.username.isNullOrBlank() && hostInfo.password.isNullOrBlank()) {
error("username", "password") error("username", "password")

2
modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/misc/KobaltWrapperProperties.kt
View file

@ -24,7 +24,7 @@ class KobaltWrapperProperties @Inject constructor() {
} }
private fun defaultUrlFor(version: String) = private fun defaultUrlFor(version: String) =
"http://beust.com/kobalt/kobalt-$version.zip" "https://beust.com/kobalt/kobalt-$version.zip"
private val file: File private val file: File
get() = File("$WRAPPER_DIR/$KOBALT_WRAPPER_PROPERTIES") get() = File("$WRAPPER_DIR/$KOBALT_WRAPPER_PROPERTIES")

2
modules/wrapper/src/main/java/com/beust/kobalt/wrapper/Main.java
View file

@ -118,7 +118,7 @@ public class Main {
} }
private static String downloadUrl(String version) { 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 { private void initWrapperFile(String version) throws IOException {