Skip to content

Commit d49d64c

Browse files
committed
Removed jcenter 2nd default repo (apart from maven-central)
1 parent c457897 commit d49d64c

File tree

9 files changed

+9
-14
lines changed

9 files changed

+9
-14
lines changed

NEWS.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
# Changes
22

3+
## 3.1
4+
5+
Major changes & enhancments
6+
* Removed jcenter 2nd default repo (apart from maven-central)
7+
38
## 3.0
49

510
Major Enhancements

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@ Using annotations instead of comment directives to configure scripts is cleaner
367367
print("1+1")
368368
```
369369

370-
To enable the use of these annotations in Intellij, the user must add the following artifact (hosted on jcenter) to the project dependencies:
370+
To enable the use of these annotations in Intellij, the user must add the following artifact to the project dependencies:
371371
```
372372
com.github.holgerbrandl:kscript-annotations:1.2
373373
```

build.gradle.kts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,6 @@ dependencies {
2525
testImplementation(kotlin("script-runtime"))
2626
}
2727

28-
repositories {
29-
jcenter()
30-
}
31-
3228
val shadowJar by tasks.getting(ShadowJar::class) {
3329
// set empty string to classifier and version to get predictable jar file name: build/libs/kscript.jar
3430
archiveFileName.set("kscript.jar")

src/main/kotlin/kscript/app/KotlinResolverExample.kt renamed to misc/CustomResolverExample.kts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@ import kotlin.script.experimental.dependencies.RepositoryCoordinates
66
import kotlin.script.experimental.dependencies.maven.MavenDependenciesResolver
77

88
suspend fun main() {
9-
10-
11-
// https://stackoverflow.com/questions/44265547/how-to-properly-specify-jcenter-repository-in-maven-config
129
val jcenterResolver = MavenDependenciesResolver().apply {
1310
addRepository(RepositoryCoordinates("https://jcenter.bintray.com") )
1411
}

misc/gradle2deps/gradle2deps.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ val reposAnnotatoins = gradle
3333
.mapIndexed { index, repoUrl -> """@file:MavenRepository("repo${index + 1}","$repoUrl")""" }
3434

3535
// Examples
36-
// jcenter()
3736
// mavenLocal()
3837
// mavenCentral()
3938
// maven { url 'https://jitpack.io' }

misc/kscript_release.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
## Release Checklist
22

33
# 1. Increment version in `Kscript.kt`
4-
# 2. Make sure that support api version is up to date and available from jcenter
4+
# 2. Make sure that support api version is up to date and has been released to maven-central
55
# 3. Push and wait for travis CI results
66

77
#export KSCRIPT_HOME="/Users/brandl/projects/kotlin/kscript";

misc/kshell_launcher/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Based on https://github.com/khud/sparklin which is a proof-of-concept software t
55

66
## Installation
77

8-
Since not all dependencies of `sparklin` are hosted on jcenter/maven-central yet, we need to install some of its dependencies manually into our local maven repo
8+
Since not all dependencies of `sparklin` are hosted on maven-central yet, we need to install some of its dependencies manually into our local maven repo
99

1010
```bash
1111
git clone https://github.com/khud/sparklin

src/main/kotlin/kscript/app/AppHelpers.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,6 @@ plugins {
296296
297297
repositories {
298298
mavenLocal()
299-
jcenter()
300299
$stringifiedRepos
301300
}
302301
@@ -432,7 +431,6 @@ plugins {
432431
433432
repositories {
434433
mavenLocal()
435-
jcenter()
436434
$stringifiedRepos
437435
}
438436

src/main/kotlin/kscript/app/DependencyUtil.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ fun resolveDependenciesViaKotlin(depIds: List<String>, customRepos: List<MavenRe
8787
// validate dependencies
8888
depIds.map { depIdToArtifact(it) }
8989

90-
val extRepos = customRepos + MavenRepo("jcenter", "https://jcenter.bintray.com")
90+
val extRepos = customRepos //+ MavenRepo("jcenter", "https://jcenter.bintray.com")
9191

9292
val repoCoords = extRepos.map { MavenRepositoryCoordinates(it.url, it.user, it.password, null, null) }
9393

0 commit comments

Comments
 (0)