Skip to content

Commit 744d8f2

Browse files
authored
Merge pull request #353 from sxci/update_gradle_config
update gradle config [ci skip]
2 parents 58d6cc4 + 375092a commit 744d8f2

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,4 @@ build/
3131
.idea/workspace.xml
3232
.idea/libraries
3333
.idea/kotlinc.xml
34-
.idea/caches/build_file_checksums.ser
34+
.idea/caches/

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ buildscript {
99
google()
1010
}
1111
dependencies {
12-
classpath 'com.android.tools.build:gradle:3.5.1'
12+
classpath 'com.android.tools.build:gradle:3.5.2'
1313

1414
// NOTE: Do not place your application dependencies here; they belong
1515
// in the individual module build.gradle files

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#Wed Jan 09 22:33:48 CST 2019
1+
#Fri Nov 15 14:34:59 CST 2019
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME

library/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,8 @@ task releaseJar(type: Jar, dependsOn: 'build') {
7373
android.libraryVariants.all { variant ->
7474
def name = variant.buildType.name
7575
def task = project.tasks.create "jar${name.capitalize()}", Jar
76-
task.dependsOn variant.javaCompile
77-
task.from variant.javaCompile.destinationDir
76+
task.dependsOn variant.javaCompileProvider
77+
task.from variant.javaCompileProvider.get().destinationDir
7878
task.exclude '**/R.*', '**/R$*.*', '**/BuildConfig.class'
7979
artifacts.add('archives', task)
8080
}

library/library.iml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
<facet type="android-gradle" name="Android-Gradle">
55
<configuration>
66
<option name="GRADLE_PROJECT_PATH" value=":library" />
7-
<option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" value="3.5.1" />
8-
<option name="LAST_KNOWN_AGP_VERSION" value="3.5.1" />
7+
<option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" value="3.5.2" />
8+
<option name="LAST_KNOWN_AGP_VERSION" value="3.5.2" />
99
</configuration>
1010
</facet>
1111
<facet type="android" name="Android">
@@ -20,7 +20,7 @@
2020
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
2121
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
2222
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res;file://$MODULE_DIR$/build/generated/res/resValues/debug" />
23-
<option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" />
23+
<option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="" />
2424
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
2525
<option name="PROJECT_TYPE" value="1" />
2626
</configuration>

0 commit comments

Comments
 (0)