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.

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

4.10: Version bump of kotlin, okio. #7225

Merged
merged 8 commits into from Apr 9, 2022
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 3 additions & 6 deletions android-test/build.gradle
Expand Up @@ -2,12 +2,9 @@ apply plugin: 'com.android.library'
apply plugin: 'org.jetbrains.kotlin.android'

repositories {
jcenter {
// Required for a dependency of Android lint.
content {
includeGroup 'org.jetbrains.trove4j'
}
}
mavenCentral()
gradlePluginPortal()
google()
}

android {
Expand Down
16 changes: 7 additions & 9 deletions build.gradle
Expand Up @@ -7,17 +7,17 @@ buildscript {
'bouncycastle': '1.65',
'brotli': '0.1.2',
'checkstyle': '8.28',
'conscrypt': '2.5.1',
'conscrypt': '2.5.2',
'corretto': '1.3.1',
'findbugs': '3.0.2',
'guava': '28.2-jre',
'guava': '31.1-jre',
'java': '1.8',
'jnrUnixsocket': '0.28',
'jsoup': '1.13.1',
'junit': '4.13',
'kotlin': '1.4.10',
'kotlin': '1.6.20',
'moshi': '1.9.2',
'okio': '2.8.0',
'okio': '3.0.0',
'ktlint': '0.38.0',
'picocli': '4.2.0',
'openjsse': '1.1.0'
Expand Down Expand Up @@ -47,9 +47,9 @@ buildscript {
]

dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.10"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10"
classpath "org.jetbrains.dokka:dokka-gradle-plugin:0.10.1"
classpath "com.android.tools.build:gradle:4.0.1"
classpath "com.android.tools.build:gradle:4.0.2"
}

repositories {
Expand Down Expand Up @@ -93,9 +93,6 @@ allprojects {

repositories {
mavenCentral()
maven {
url 'https://dl.bintray.com/kotlin/dokka'
}
google()
}

Expand Down Expand Up @@ -157,6 +154,7 @@ subprojects { project ->
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
kotlinOptions {
jvmTarget = "1.8"
freeCompilerArgs += "-Xjvm-default=compatibility"
}
}

Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists