Skip to content

Migrate core libraries to Gradle Kotlin DSL. #4452

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

Merged
merged 6 commits into from
Dec 14, 2022
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ android {
targetSdkVersion project.targetSdkVersion
minSdkVersion project.minSdkVersion
versionName version
multiDexEnabled = true
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
testInstrumentationRunnerArgument "firebaseAppCheckDebugSecret", System.getenv("FIREBASE_APP_CHECK_DEBUG_SECRET") ?: ''
}
Expand Down
1 change: 1 addition & 0 deletions appcheck/firebase-appcheck/firebase-appcheck.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ android {
defaultConfig {
targetSdkVersion project.targetSdkVersion
minSdkVersion project.minSdkVersion
multiDexEnabled = true
versionName version
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,15 @@ fun toBoolean(value: Any?): Boolean {

/** Finds or creates the javadocClasspath [Configuration]. */
val Project.javadocConfig: Configuration
get() = configurations.findByName("javadocClasspath") ?: configurations.create("javadocClasspath")
get() =
configurations.findByName("javadocClasspath")
?: configurations.create("javadocClasspath").also { javadocClasspath ->
configurations.all {
if (name == "compileOnly") {
javadocClasspath.extendsFrom(this)
}
}
}

/**
* Finds or creates the dackkaArtifacts [Configuration].
Expand Down
2 changes: 1 addition & 1 deletion contributor-docs/best_practices/dependency_injection.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ plugins {

dependencies {
implementation(libs.javax.inject)
vendor(libs.dagger) {
vendor(libs.dagger.dagger) {
exclude group: "javax.inject", module: "javax.inject"
}
annotationProcessor(libs.dagger.compiler)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,23 +13,22 @@
// limitations under the License.

plugins {
id 'firebase-java-library'
id("firebase-java-library")
}

firebaseLibrary {
publishSources = true
publishJavadoc = false
publishSources = true
publishJavadoc = false
}

java {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}

tasks.withType(JavaCompile) {
options.compilerArgs << "-Werror"
tasks.withType<JavaCompile> {
options.compilerArgs.add("-Werror")
}

dependencies {
implementation 'javax.inject:javax.inject:1'
implementation(libs.javax.inject)
}
54 changes: 0 additions & 54 deletions firebase-common/data-collection-tests/data-collection-tests.gradle

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
// Copyright 2018 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

plugins {
id("com.android.application")
}

android {
val targetSdkVersion : Int by rootProject
val minSdkVersion : Int by rootProject
compileSdk = targetSdkVersion
defaultConfig {
minSdk = minSdkVersion
targetSdk = targetSdkVersion
multiDexEnabled = true
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
}
compileOptions {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}
testOptions.unitTests.isIncludeAndroidResources = true
}

dependencies {
implementation(project(":firebase-common"))
implementation(project(":firebase-components"))
testImplementation(libs.androidx.test.runner)
testImplementation(libs.androidx.test.junit)
testImplementation(libs.robolectric)
testImplementation(libs.autovalue.annotations)
testImplementation(libs.junit)
testImplementation(libs.truth)
testImplementation(libs.mockito.core)
testImplementation(libs.androidx.core)
}
100 changes: 0 additions & 100 deletions firebase-common/firebase-common.gradle

This file was deleted.

84 changes: 84 additions & 0 deletions firebase-common/firebase-common.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
// Copyright 2018 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

plugins {
id("firebase-library")
}

firebaseLibrary {
testLab.enabled = true
publishSources = true
}

android {
val targetSdkVersion : Int by rootProject
val minSdkVersion : Int by rootProject

compileSdk = targetSdkVersion
defaultConfig {
minSdk = minSdkVersion
targetSdk = targetSdkVersion
multiDexEnabled = true
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles("proguard.txt")
}
sourceSets {
getByName("androidTest") {
java.srcDirs("src/testUtil")
}
getByName("test") {
java.srcDirs("src/testUtil")
}
}
compileOptions {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}
testOptions.unitTests.isIncludeAndroidResources = true
}

dependencies {
implementation(project(":firebase-annotations"))
implementation(project(":firebase-components"))
implementation(libs.androidx.futures)
implementation(libs.playservices.basement)
implementation(libs.playservices.tasks)

annotationProcessor(libs.autovalue)

compileOnly(libs.autovalue.annotations)
compileOnly(libs.findbugs.jsr305)
// needed for Kotlin detection to compile, but not necessarily present at runtime.
compileOnly(libs.kotlin.stdlib)

// FirebaseApp references storage, so storage needs to be on classpath when dokka runs.
javadocClasspath(project(":firebase-storage"))

testImplementation(libs.androidx.test.junit)
testImplementation(libs.androidx.test.junit)
testImplementation(libs.androidx.test.runner)
testImplementation(libs.junit)
testImplementation(libs.mockito.core)
testImplementation(libs.org.json)
testImplementation(libs.robolectric)
testImplementation(libs.truth)

androidTestImplementation(libs.androidx.test.junit)
androidTestImplementation(libs.androidx.test.runner)
androidTestImplementation(libs.junit)
androidTestImplementation(libs.mockito.core)
androidTestImplementation(libs.mockito.dexmaker)
androidTestImplementation(libs.truth)
androidTestImplementation(project(":integ-testing"))
}
4 changes: 0 additions & 4 deletions firebase-common/lint-baseline.xml

This file was deleted.

Loading