File tree Expand file tree Collapse file tree 3 files changed +5
-11
lines changed
Expand file tree Collapse file tree 3 files changed +5
-11
lines changed Original file line number Diff line number Diff line change @@ -42,5 +42,5 @@ before_script:
4242 - adb shell input keyevent 82
4343
4444script :
45- - ./gradlew test -PdisablePreDex
46- - ./gradlew connectedAndroidTest -PdisablePreDex
45+ - ./gradlew test
46+ - ./gradlew connectedAndroidTest
Original file line number Diff line number Diff line change 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
Original file line number Diff line number Diff line change @@ -241,7 +241,7 @@ afterEvaluate {
241241}
242242
243243task 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'
You can’t perform that action at this time.
0 commit comments