Skip to content

Commit ba70cd7

Browse files
pubiqqraajkumars
authored andcommitted
[Gradle] Fix Gradle warnings
Resolves #2899 GIT_ORIGIN_REV_ID=02220413a6cd9056718d659a18dd7251e6c4c55d PiperOrigin-RevId: 486658302
1 parent f9a37c5 commit ba70cd7

File tree

3 files changed

+5
-11
lines changed

3 files changed

+5
-11
lines changed

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,5 +42,5 @@ before_script:
4242
- adb shell input keyevent 82
4343

4444
script:
45-
- ./gradlew test -PdisablePreDex
46-
- ./gradlew connectedAndroidTest -PdisablePreDex
45+
- ./gradlew test
46+
- ./gradlew connectedAndroidTest

build.gradle

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,6 @@ ext {
5151
// required for the doclava dependency.
5252
usePrebuilts = "true"
5353

54-
// Disable pre-dexing when gradle called with -PdisablePreDex;
55-
preDexLibs = !project.hasProperty('disablePreDex')
56-
5754
mavenRepoUrl = (project.hasProperty('mavenRepoUrl')
5855
? project.property('mavenRepoUrl') : '/tmp/myRepo/')
5956

@@ -189,9 +186,6 @@ subprojects {
189186
}
190187

191188
if (isAndroidLibrary || isAndroidApp || isAndroidTest) {
192-
// Disable pre-dexing when gradle called with -PdisablePreDex;
193-
project.android.dexOptions.preDexLibraries = rootProject.ext.preDexLibs
194-
195189
project.android {
196190
compileSdkVersion rootProject.ext.compileSdkVersion
197191

@@ -207,8 +201,8 @@ subprojects {
207201
aaptOptions.additionalParameters "--no-version-vectors"
208202

209203
android {
210-
lintOptions {
211-
check 'NewApi'
204+
lint {
205+
checkOnly 'NewApi'
212206
}
213207
}
214208

lib/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ afterEvaluate {
241241
}
242242

243243
task androidSourcesJar(type: Jar) {
244-
classifier = 'sources'
244+
archiveClassifier.set('sources')
245245
from(android.sourceSets.main.java.srcDirs) {
246246
// Needed because we have Java sources and resources in same directory
247247
include '**/*.java'

0 commit comments

Comments
 (0)