-
Notifications
You must be signed in to change notification settings - Fork 617
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
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
c4e55b7
Migrate core libraries to Gradle Kotlin DSL.
vkryachko 2c0c05f
update
vkryachko 654ddb2
Add functions, fix tests
vkryachko 01555fb
fix docs
vkryachko d4421df
fix functions ktx minSdk version.
vkryachko 065d20d
Apply suggestions from code review
vkryachko File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
54 changes: 0 additions & 54 deletions
54
firebase-common/data-collection-tests/data-collection-tests.gradle
This file was deleted.
Oops, something went wrong.
47 changes: 47 additions & 0 deletions
47
firebase-common/data-collection-tests/data-collection-tests.gradle.kts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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) | ||
} |
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,84 @@ | ||
// Copyright 2018 Google LLC | ||
vkryachko marked this conversation as resolved.
Show resolved
Hide resolved
|
||
// | ||
// 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")) | ||
} |
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.