Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrate away from bintray and upgrade jvm to 11 #990

Open
wants to merge 4 commits into
base: 2.x
Choose a base branch
from
Open

Migrate away from bintray and upgrade jvm to 11 #990

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
931d1f3
Migrate away from bintray and upgrade jvm to 11
MetroSteffenPaul Feb 12, 2022
d129e3c
Add snapshot repo
MetroSteffenPaul Feb 12, 2022
8370212
Add snapshot repo
MetroSteffenPaul Feb 12, 2022
7e5a593
Add snapshot repo
MetroSteffenPaul Feb 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ reckon {

allprojects {
repositories {
jcenter()
maven ("https://dl.bintray.com/kotlin/kotlin-eap")
maven ("https://kotlin.bintray.com/kotlinx")
mavenCentral()
maven ("https://www.jetbrains.com/intellij-repository/releases")
maven ("https://www.jetbrains.com/intellij-repository/snapshots")
}

if (Files.exists(Paths.get("$rootDir/local.properties"))) {
Expand All @@ -39,7 +39,7 @@ allprojects {
if (this is KotlinJvmCompile) {
kotlinOptions {
apiVersion = "1.4"
jvmTarget = "1.8"
jvmTarget = "11"
}
} else {
kotlinOptions {
Expand Down
2 changes: 1 addition & 1 deletion buildSrc/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ plugins {
}

repositories {
jcenter()
mavenCentral()
gradlePluginPortal()
}

Expand Down
2 changes: 1 addition & 1 deletion docs/setup-android.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ The setup assumes you are using Gradle `4.7` or above as it has a built-in suppo

```groovy
repositories {
jcenter()
mavenCentral()
}

// setup dependencies
Expand Down
6 changes: 3 additions & 3 deletions integration-test/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ plugins {
}

repositories {
jcenter()
maven ("https://dl.bintray.com/kotlin/kotlin-eap")
maven ("https://kotlin.bintray.com/kotlinx")
mavenCentral()
maven ("https://www.jetbrains.com/intellij-repository/releases")
maven ("https://www.jetbrains.com/intellij-repository/snapshots")
}

kotlin {
Expand Down
2 changes: 1 addition & 1 deletion integration-test/buildSrc/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
repositories {
jcenter()
mavenCentral()
}

dependencies {
Expand Down
6 changes: 3 additions & 3 deletions integration-test/settings.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ includeBuild("../") {

pluginManagement {
repositories {
jcenter()
maven ("https://dl.bintray.com/kotlin/kotlin-eap")
maven ("https://kotlin.bintray.com/kotlinx")
mavenCentral()
maven ("https://www.jetbrains.com/intellij-repository/releases")
maven ("https://www.jetbrains.com/intellij-repository/snapshots")
}
resolutionStrategy.eachPlugin {
if (requested.id.id == "org.spekframework.spek2.multiplatform") {
Expand Down
4 changes: 2 additions & 2 deletions samples/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ buildscript {
ext.kotlin_version = '1.3.61'
repositories {
google()
jcenter()
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.6.1'
Expand All @@ -19,7 +19,7 @@ buildscript {
allprojects {
repositories {
google()
jcenter()
mavenCentral()
// uncomment to use development build
maven { url "https://dl.bintray.com/spekframework/spek-dev" }
}
Expand Down
4 changes: 2 additions & 2 deletions samples/jvm/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ buildscript {
ext.spek_version = '2.1.0-alpha.0.14+a763c30'

repositories {
jcenter()
mavenCentral()
}

dependencies {
Expand All @@ -15,7 +15,7 @@ apply plugin: 'kotlin'

repositories {
mavenLocal()
jcenter()
mavenCentral()
// uncomment to use development build
maven { url "https://dl.bintray.com/spekframework/spek-dev" }
}
Expand Down
4 changes: 2 additions & 2 deletions samples/multiplatform/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ buildscript {
ext.spek_version = '2.1.0-alpha.0.14+a763c30'

repositories {
jcenter()
mavenCentral()
}
dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
Expand All @@ -15,7 +15,7 @@ apply plugin: 'kotlin-multiplatform'

repositories {
mavenLocal()
jcenter()
mavenCentral()
// uncomment to use development build
maven { url "https://dl.bintray.com/spekframework/spek-dev" }
}
Expand Down
2 changes: 1 addition & 1 deletion spek-gradle-plugin/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ plugins {
}

repositories {
jcenter()
mavenCentral()
}

gradlePlugin {
Expand Down
2 changes: 1 addition & 1 deletion spek-ide-plugin-android-studio/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ dependencies {
tasks {
compileKotlin {
kotlinOptions {
jvmTarget = "1.8"
jvmTarget = "11"
}
}

Expand Down
2 changes: 1 addition & 1 deletion spek-ide-plugin-intellij-base-jvm/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ dependencies {
tasks {
compileKotlin {
kotlinOptions {
jvmTarget = "1.8"
jvmTarget = "11"
}
}
}
2 changes: 1 addition & 1 deletion spek-ide-plugin-intellij-base/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ dependencies {
tasks {
compileKotlin {
kotlinOptions {
jvmTarget = "1.8"
jvmTarget = "11"
}
}

Expand Down
2 changes: 1 addition & 1 deletion spek-ide-plugin-intellij-idea/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ dependencies {
tasks {
compileKotlin {
kotlinOptions {
jvmTarget = "1.8"
jvmTarget = "11"
}
}

Expand Down
2 changes: 1 addition & 1 deletion spek-kotlin-compiler-plugin-jvm/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ tasks {

compileKotlin {
kotlinOptions {
jvmTarget = "1.8"
jvmTarget = "11"
}
}
}
2 changes: 1 addition & 1 deletion spek-kotlin-compiler-plugin-native/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ tasks {

compileKotlin {
kotlinOptions {
jvmTarget = "1.8"
jvmTarget = "11"
}
}
}