Skip to content

Commit

Permalink
[Gradle] Fix Gradle warnings
Browse files Browse the repository at this point in the history
Resolves #2899

GIT_ORIGIN_REV_ID=02220413a6cd9056718d659a18dd7251e6c4c55d
PiperOrigin-RevId: 486658302
  • Loading branch information
pubiqq authored and raajkumars committed Nov 7, 2022
1 parent f9a37c5 commit ba70cd7
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 11 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,5 +42,5 @@ before_script:
- adb shell input keyevent 82

script:
- ./gradlew test -PdisablePreDex
- ./gradlew connectedAndroidTest -PdisablePreDex
- ./gradlew test
- ./gradlew connectedAndroidTest
10 changes: 2 additions & 8 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,6 @@ ext {
// required for the doclava dependency.
usePrebuilts = "true"

// Disable pre-dexing when gradle called with -PdisablePreDex;
preDexLibs = !project.hasProperty('disablePreDex')

mavenRepoUrl = (project.hasProperty('mavenRepoUrl')
? project.property('mavenRepoUrl') : '/tmp/myRepo/')

Expand Down Expand Up @@ -189,9 +186,6 @@ subprojects {
}

if (isAndroidLibrary || isAndroidApp || isAndroidTest) {
// Disable pre-dexing when gradle called with -PdisablePreDex;
project.android.dexOptions.preDexLibraries = rootProject.ext.preDexLibs

project.android {
compileSdkVersion rootProject.ext.compileSdkVersion

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

android {
lintOptions {
check 'NewApi'
lint {
checkOnly 'NewApi'
}
}

Expand Down
2 changes: 1 addition & 1 deletion lib/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ afterEvaluate {
}

task androidSourcesJar(type: Jar) {
classifier = 'sources'
archiveClassifier.set('sources')
from(android.sourceSets.main.java.srcDirs) {
// Needed because we have Java sources and resources in same directory
include '**/*.java'
Expand Down

0 comments on commit ba70cd7

Please sign in to comment.