Skip to content

Commit 41743ec

Browse files
committed
Revert "Upgrade kotlin version to 1.6.20 (#3762)"
This reverts commit fd109a8. This change broke kotlindoc generation, will have to fix it before upgrading again.
1 parent fd109a8 commit 41743ec

File tree

6 files changed

+5
-14
lines changed

6 files changed

+5
-14
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import com.google.firebase.gradle.plugins.license.LicenseResolverPlugin
1616
import com.google.firebase.gradle.MultiProjectReleasePlugin
1717

1818
buildscript {
19-
ext.kotlinVersion = '1.6.20'
19+
ext.kotlinVersion = '1.3.72'
2020
repositories {
2121
google()
2222
mavenCentral()

buildSrc/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ dependencies {
5151
implementation "com.google.auto.value:auto-value-annotations:1.7"
5252
annotationProcessor "com.google.auto.value:auto-value:1.6.5"
5353
implementation 'digital.wup:android-maven-publish:3.6.3'
54-
implementation 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.20'
54+
implementation 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72'
5555
implementation 'org.json:json:20180813'
5656

5757
implementation "org.eclipse.aether:aether-api:1.0.0.v20140518"

buildSrc/src/main/java/com/google/firebase/gradle/plugins/LibraryType.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,6 @@ public String getFormat() {
2929
}
3030

3131
public String getComponentName() {
32-
// Due to the fact that multiple components are created for android libraries(1 per variant),
33-
// the "android" component contains artifacts from all 3 variants for Kotlin libraries, which is
34-
// invalid(bug in
35-
// https://github.com/wupdigital/android-maven-publish ?).
36-
// So we explicitly choose the "Release" variant for android libraries.
37-
if (this == ANDROID) {
38-
return name().toLowerCase() + "Release";
39-
}
4032
return name().toLowerCase();
4133
}
4234
}

encoders/protoc-gen-firebase-encoders/protoc-gen-firebase-encoders.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ dependencies {
3636
implementation "com.google.protobuf:protobuf-java:3.14.0"
3737
implementation 'com.squareup:javapoet:1.13.0'
3838
implementation 'com.google.guava:guava:30.0-jre'
39-
implementation 'com.google.dagger:dagger:2.39.1'
40-
kapt 'com.google.dagger:dagger-compiler:2.39.1'
39+
implementation 'com.google.dagger:dagger:2.31.2'
40+
kapt 'com.google.dagger:dagger-compiler:2.31.2'
4141

4242
testImplementation 'junit:junit:4.13.1'
4343
testImplementation "com.google.truth:truth:1.0.1"

firebase-common/ktx/ktx.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ android {
3636
}
3737

3838
dependencies {
39-
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
39+
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
4040

4141
implementation project(':firebase-common')
4242
implementation project(':firebase-components')

tools/lint/lint.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ plugins {
1919
def lintVersion = '26.4.1'
2020

2121
dependencies {
22-
compileOnly "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
2322
compileOnly "com.android.tools.lint:lint-api:$lintVersion"
2423
compileOnly "com.android.tools.lint:lint-checks:$lintVersion"
2524

0 commit comments

Comments
 (0)