-
Notifications
You must be signed in to change notification settings - Fork 3.8k
[various] Convert plugin builds to Kotlin gradle #11172
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
Changes from 36 commits
a9f22ea
f72f9dd
8b6ee1e
1c6fbb0
1d9a09b
3a34e12
7bfc8ad
bec135d
a9c8061
41622f2
c6a8cb2
11e903c
5b0c67a
895f104
f5dadd7
6442ad5
3ef33d4
2b7f2c7
eae9f7b
7097fe9
a33e437
c0ea36b
47e534b
b9627d5
ad725eb
9e45eba
f3fd907
e30d40d
46597c7
2735899
b5a0c09
8181810
8976f01
36513b2
62b45cb
6d53e57
6de3cf9
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
This file was deleted.
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| rootProject.name = "camera_android" |
This file was deleted.
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| rootProject.name = "camera_android_camerax" |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -12,14 +12,16 @@ buildscript { | |
| } | ||
| } | ||
|
|
||
| rootProject.allprojects { | ||
| allprojects { | ||
| repositories { | ||
| google() | ||
| mavenCentral() | ||
| } | ||
| } | ||
|
|
||
| apply plugin: 'com.android.library' | ||
| plugins { | ||
| id("com.android.library") | ||
| } | ||
|
|
||
| android { | ||
| namespace = "com.example.espresso" | ||
|
|
@@ -38,19 +40,20 @@ android { | |
| lint { | ||
| checkAllWarnings = true | ||
| warningsAsErrors = true | ||
| disable 'AndroidGradlePluginVersion', 'InvalidPackage', 'GradleDependency', 'NewerVersionAvailable' | ||
| disable.addAll(setOf("AndroidGradlePluginVersion", "InvalidPackage", "GradleDependency", "NewerVersionAvailable")) | ||
| baseline = file("lint-baseline.xml") | ||
| } | ||
|
|
||
|
|
||
| testOptions { | ||
| unitTests.includeAndroidResources = true | ||
| unitTests.returnDefaultValues = true | ||
| unitTests.all { | ||
| testLogging { | ||
| events "passed", "skipped", "failed", "standardOut", "standardError" | ||
| outputs.upToDateWhen {false} | ||
| showStandardStreams = true | ||
| unitTests { | ||
| isIncludeAndroidResources = true | ||
| isReturnDefaultValues = true | ||
| all { | ||
| it.outputs.upToDateWhen { false } | ||
| it.testLogging { | ||
| events("passed", "skipped", "failed", "standardOut", "standardError") | ||
| showStandardStreams = true | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
@@ -88,7 +91,7 @@ dependencies { | |
|
|
||
| // The following Espresso dependency can be either "implementation" | ||
| // or "androidTestImplementation", depending on whether you want the | ||
| // dependency to appear on your APK's compile classpath or the test APK | ||
| // dependency to appear on your APK"s compile classpath or the test APK | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. this doesn't seem intentional
Collaborator
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Oops, I thought I fixed all of these. My |
||
| // classpath. | ||
| api("androidx.test.espresso:espresso-idling-resource:3.7.0") | ||
| } | ||
This file was deleted.
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| rootProject.name = "espresso" |
This file was deleted.
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| rootProject.name = "file_selector_android" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
no longer needed?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The
kotlin { compilerOptions { ... } }section on line 31 is the newer form of this.