Skip to content

Commit 8776806

Browse files
author
TUBB
committed
Update gradle plugin to the newest
1 parent a72b587 commit 8776806

File tree

8 files changed

+153
-110
lines changed

8 files changed

+153
-110
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Usage
2222
Add to dependencies
2323
```
2424
dependencies {
25-
compile 'com.tubb.smrv:swipemenu-recyclerview:5.4.7'
25+
compile 'com.tubb.smrv:swipemenu-recyclerview:5.4.8'
2626
}
2727
```
2828

‎SwipeMenu.iml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<content url="file://$MODULE_DIR$">
1414
<excludeFolder url="file://$MODULE_DIR$/.gradle" />
1515
</content>
16-
<orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
16+
<orderEntry type="inheritedJdk" />
1717
<orderEntry type="sourceFolder" forTests="false" />
1818
</component>
1919
</module>

‎app/app.iml‎

Lines changed: 75 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -17,28 +17,27 @@
1717
<option name="ALLOW_USER_CONFIGURATION" value="false" />
1818
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
1919
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
20-
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
20+
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res;file://$MODULE_DIR$/build/generated/res/resValues/debug" />
21+
<option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="" />
2122
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
2223
</configuration>
2324
</facet>
2425
</component>
2526
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
26-
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
27-
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
27+
<output url="file://$MODULE_DIR$/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes" />
28+
<output-test url="file://$MODULE_DIR$/build/intermediates/javac/debugUnitTest/compileDebugUnitTestJavaWithJavac/classes" />
2829
<exclude-output />
2930
<content url="file://$MODULE_DIR$">
3031
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
31-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
32-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
32+
<sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debug/compileDebugAidl/out" isTestSource="false" generated="true" />
3333
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
34-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
34+
<sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debug/compileDebugRenderscript/out" isTestSource="false" generated="true" />
3535
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
3636
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
3737
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
38-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
39-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
38+
<sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debugAndroidTest/compileDebugAndroidTestAidl/out" isTestSource="true" generated="true" />
4039
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
41-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
40+
<sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debugAndroidTest/compileDebugAndroidTestRenderscript/out" isTestSource="true" generated="true" />
4241
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
4342
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
4443
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/test/debug" isTestSource="true" generated="true" />
@@ -70,60 +69,91 @@
7069
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
7170
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
7271
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
73-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
74-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
75-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
76-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
77-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
78-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
79-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
8072
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
8173
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
8274
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
8375
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
8476
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
8577
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
8678
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
87-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
79+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
80+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
81+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
82+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
83+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
84+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
85+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
86+
<excludeFolder url="file://$MODULE_DIR$/build/generated/not_namespaced_r_class_sources" />
87+
<excludeFolder url="file://$MODULE_DIR$/build/generated/source/r" />
88+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotation_processor_list" />
89+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/apk_list" />
8890
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
89-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
90-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
91+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundle_manifest" />
92+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/check_manifest_result" />
93+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/compatible_screen_manifest" />
94+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
95+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/duplicate_classes_check" />
96+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/external_libs_dex" />
9197
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
92-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaPrecompile" />
93-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
94-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
95-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
98+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_app_manifest" />
99+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_run_merged_manifests" />
100+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javac" />
101+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint_jar" />
102+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_assets" />
103+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_jni_libs" />
104+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_manifests" />
105+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_shaders" />
106+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/metadata_feature_manifest" />
96107
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/prebuild" />
108+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/processed_res" />
97109
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
98-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
99-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
100-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/splits-support" />
110+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shader_assets" />
111+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/signing_config" />
101112
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
102113
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
103114
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
115+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/validate_signing_config" />
104116
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
105-
<excludeFolder url="file://$MODULE_DIR$/build/reports" />
106117
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
107118
</content>
108-
<orderEntry type="jdk" jdkName="Android API 27 Platform" jdkType="Android SDK" />
119+
<orderEntry type="jdk" jdkName="Android API 28 Platform" jdkType="Android SDK" />
109120
<orderEntry type="sourceFolder" forTests="false" />
110-
<orderEntry type="library" name="android.arch.lifecycle:common:1.1.0@jar" level="project" />
111-
<orderEntry type="library" name="com.android.support:animated-vector-drawable-27.1.1" level="project" />
112-
<orderEntry type="library" name="com.android.support:cardview-v7-27.1.1" level="project" />
113-
<orderEntry type="library" name="com.android.support:appcompat-v7-27.1.1" level="project" />
114-
<orderEntry type="library" name="com.android.support:support-core-ui-27.1.1" level="project" />
115-
<orderEntry type="library" name="android.arch.core:common:1.1.0@jar" level="project" />
116-
<orderEntry type="library" name="com.android.support:support-compat-27.1.1" level="project" />
117-
<orderEntry type="library" name="android.arch.lifecycle:viewmodel-1.1.0" level="project" />
118-
<orderEntry type="library" name="android.arch.lifecycle:livedata-core-1.1.0" level="project" />
119-
<orderEntry type="library" name="com.android.support:recyclerview-v7-27.1.1" level="project" />
120-
<orderEntry type="library" name="com.android.support:support-core-utils-27.1.1" level="project" />
121-
<orderEntry type="library" name="com.squareup.picasso:picasso:2.5.2@jar" level="project" />
122-
<orderEntry type="library" name="com.android.support:support-fragment-27.1.1" level="project" />
123-
<orderEntry type="library" name="com.android.support:support-annotations:27.1.1@jar" level="project" />
124-
<orderEntry type="library" name="com.android.support:support-vector-drawable-27.1.1" level="project" />
125-
<orderEntry type="library" name="android.arch.lifecycle:runtime-1.1.0" level="project" />
126-
<orderEntry type="library" name="android.arch.core:runtime-1.1.0" level="project" />
121+
<orderEntry type="library" name="Gradle: com.android.support:support-fragment:28.0.0@aar" level="project" />
122+
<orderEntry type="library" name="Gradle: com.android.support:localbroadcastmanager:28.0.0@aar" level="project" />
123+
<orderEntry type="library" name="Gradle: com.android.support:documentfile:28.0.0@aar" level="project" />
124+
<orderEntry type="library" name="Gradle: com.android.support:animated-vector-drawable:28.0.0@aar" level="project" />
125+
<orderEntry type="library" name="Gradle: com.android.support:slidingpanelayout:28.0.0@aar" level="project" />
126+
<orderEntry type="library" name="Gradle: android.arch.lifecycle:viewmodel:1.1.1@aar" level="project" />
127+
<orderEntry type="library" name="Gradle: com.android.support:appcompat-v7:28.0.0@aar" level="project" />
128+
<orderEntry type="library" name="Gradle: com.android.support:loader:28.0.0@aar" level="project" />
129+
<orderEntry type="library" name="Gradle: android.arch.core:runtime:1.1.1@aar" level="project" />
130+
<orderEntry type="library" name="Gradle: android.arch.lifecycle:livedata-core:1.1.1@aar" level="project" />
131+
<orderEntry type="library" name="Gradle: com.android.support:collections:28.0.0@jar" level="project" />
132+
<orderEntry type="library" name="Gradle: com.android.support:cursoradapter:28.0.0@aar" level="project" />
133+
<orderEntry type="library" name="Gradle: android.arch.lifecycle:runtime:1.1.1@aar" level="project" />
134+
<orderEntry type="library" name="Gradle: com.android.support:support-compat:28.0.0@aar" level="project" />
135+
<orderEntry type="library" name="Gradle: com.android.support:support-core-ui:28.0.0@aar" level="project" />
136+
<orderEntry type="library" name="Gradle: com.android.support:cardview-v7:28.0.0@aar" level="project" />
137+
<orderEntry type="library" name="Gradle: com.android.support:asynclayoutinflater:28.0.0@aar" level="project" />
138+
<orderEntry type="library" name="Gradle: com.android.support:print:28.0.0@aar" level="project" />
139+
<orderEntry type="library" name="Gradle: com.squareup.okio:okio:1.14.0@jar" level="project" />
140+
<orderEntry type="library" name="Gradle: com.squareup.picasso:picasso:2.71828@aar" level="project" />
141+
<orderEntry type="library" name="Gradle: android.arch.core:common:1.1.1@jar" level="project" />
142+
<orderEntry type="library" name="Gradle: com.android.support:versionedparcelable:28.0.0@aar" level="project" />
143+
<orderEntry type="library" name="Gradle: com.android.support:viewpager:28.0.0@aar" level="project" />
144+
<orderEntry type="library" name="Gradle: com.android.support:exifinterface:27.1.0@aar" level="project" />
145+
<orderEntry type="library" name="Gradle: com.squareup.okhttp3:okhttp:3.10.0@jar" level="project" />
146+
<orderEntry type="library" name="Gradle: com.android.support:support-core-utils:28.0.0@aar" level="project" />
147+
<orderEntry type="library" name="Gradle: com.android.support:recyclerview-v7:28.0.0@aar" level="project" />
148+
<orderEntry type="library" name="Gradle: com.android.support:support-vector-drawable:28.0.0@aar" level="project" />
149+
<orderEntry type="library" name="Gradle: com.android.support:support-annotations:28.0.0@jar" level="project" />
150+
<orderEntry type="library" name="Gradle: android.arch.lifecycle:common:1.1.1@jar" level="project" />
151+
<orderEntry type="library" name="Gradle: com.android.support:interpolator:28.0.0@aar" level="project" />
152+
<orderEntry type="library" name="Gradle: android.arch.lifecycle:livedata:1.1.1@aar" level="project" />
153+
<orderEntry type="library" name="Gradle: com.android.support:drawerlayout:28.0.0@aar" level="project" />
154+
<orderEntry type="library" name="Gradle: com.android.support:coordinatorlayout:28.0.0@aar" level="project" />
155+
<orderEntry type="library" name="Gradle: com.android.support:customview:28.0.0@aar" level="project" />
156+
<orderEntry type="library" name="Gradle: com.android.support:swiperefreshlayout:28.0.0@aar" level="project" />
127157
<orderEntry type="module" module-name="library" />
128158
</component>
129159
</module>

‎app/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ android {
2626
dependencies {
2727
implementation fileTree(dir: 'libs', include: ['*.jar'])
2828
implementation 'com.android.support:appcompat-v7:'+project.supportVersion
29-
implementation 'com.squareup.picasso:picasso:2.5.2'
29+
implementation 'com.squareup.picasso:picasso:'+project.picassoVersion
3030
implementation 'com.android.support:cardview-v7:'+project.supportVersion
3131
implementation 'com.android.support:recyclerview-v7:'+project.supportVersion
3232
implementation project(':library')

‎build.gradle‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ buildscript {
66
jcenter()
77
}
88
dependencies {
9-
classpath 'com.android.tools.build:gradle:3.1.1'
9+
classpath 'com.android.tools.build:gradle:3.4.1'
1010
// NOTE: Do not place your application dependencies here; they belong
1111
// in the individual module build.gradle files
1212
}
@@ -18,12 +18,13 @@ allprojects {
1818
jcenter()
1919
}
2020
ext {
21-
compileSdkVersion=27
22-
buildToolsVersion='27.0.3'
21+
compileSdkVersion=28
22+
buildToolsVersion='28.0.3'
2323
minSdkVersion=14
24-
targetSdkVersion=27
25-
supportVersion='27.1.1'
24+
targetSdkVersion=28
25+
supportVersion='28.0.0'
2626
versionCode=35
27-
versionName='5.4.7'
27+
versionName='5.4.8'
28+
picassoVersion='2.71828'
2829
}
2930
}

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Fri Oct 09 16:08:59 CST 2015
1+
#Thu May 16 16:21:28 CST 2019
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip

‎library/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ buildscript {
88
}
99
}
1010
dependencies {
11-
classpath 'com.novoda:bintray-release:0.8.0'
11+
classpath 'com.novoda:bintray-release:0.9.1'
1212
}
1313
}
1414

0 commit comments

Comments
 (0)