Skip to content

Commit ac5331e

Browse files
dongjunkundongjunkun
committed
update gradle plugin
1 parent 202858c commit ac5331e

File tree

8 files changed

+111
-44
lines changed

8 files changed

+111
-44
lines changed

‎DropDownMenu.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="inheritedJdk" />
16+
<orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
1717
<orderEntry type="sourceFolder" forTests="false" />
1818
</component>
1919
</module>

‎app/app.iml

Lines changed: 46 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,7 @@
1212
<option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
1313
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
1414
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
15-
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
16-
<option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugAndroidTestSources" />
1715
<afterSyncTasks>
18-
<task>generateDebugAndroidTestSources</task>
1916
<task>generateDebugSources</task>
2017
</afterSyncTasks>
2118
<option name="ALLOW_USER_CONFIGURATION" value="false" />
@@ -28,19 +25,21 @@
2825
</component>
2926
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
3027
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
31-
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" />
28+
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
3229
<exclude-output />
3330
<content url="file://$MODULE_DIR$">
3431
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
3532
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
3633
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
3734
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
35+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
3836
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
3937
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
4038
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
4139
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
4240
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
4341
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
42+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
4443
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
4544
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
4645
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
@@ -50,49 +49,80 @@
5049
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
5150
<sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
5251
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
52+
<sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
53+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
54+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
55+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
56+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
57+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
58+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/jni" isTestSource="true" />
59+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
60+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
5361
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
5462
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
5563
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
5664
<sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
5765
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
5866
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
5967
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
68+
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
6069
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
6170
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
6271
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
6372
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
6473
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
6574
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
6675
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
76+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
77+
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
78+
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
79+
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
80+
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
81+
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
82+
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
83+
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
84+
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
6785
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
6886
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
6987
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
7088
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
71-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.1.1/jars" />
72-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.1.1/jars" />
89+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/animated-vector-drawable/24.2.1/jars" />
90+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/24.2.1/jars" />
91+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-compat/24.2.1/jars" />
92+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-core-ui/24.2.1/jars" />
93+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-core-utils/24.2.1/jars" />
94+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-fragment/24.2.1/jars" />
95+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-media-compat/24.2.1/jars" />
96+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/24.2.1/jars" />
97+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-vector-drawable/24.2.1/jars" />
7398
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
74-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
75-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
76-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
77-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
99+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
78100
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
79101
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
80102
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
81-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
82103
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
83-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" />
84104
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
105+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
85106
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
86107
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
87108
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
88109
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
89110
</content>
90-
<orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
111+
<orderEntry type="jdk" jdkName="Android API 24 Platform" jdkType="Android SDK" />
91112
<orderEntry type="sourceFolder" forTests="false" />
92-
<orderEntry type="library" exported="" name="support-annotations-23.1.1" level="project" />
93-
<orderEntry type="library" exported="" name="support-v4-23.1.1" level="project" />
94-
<orderEntry type="library" exported="" name="appcompat-v7-23.1.1" level="project" />
113+
<orderEntry type="library" exported="" name="support-annotations-24.2.1" level="project" />
114+
<orderEntry type="library" exported="" name="support-v4-24.2.1" level="project" />
115+
<orderEntry type="library" exported="" name="support-compat-24.2.1" level="project" />
116+
<orderEntry type="library" exported="" name="support-media-compat-24.2.1" level="project" />
117+
<orderEntry type="library" exported="" name="animated-vector-drawable-24.2.1" level="project" />
118+
<orderEntry type="library" exported="" name="support-fragment-24.2.1" level="project" />
119+
<orderEntry type="library" exported="" name="support-core-ui-24.2.1" level="project" />
95120
<orderEntry type="library" exported="" name="butterknife-6.1.0" level="project" />
121+
<orderEntry type="library" exported="" name="appcompat-v7-24.2.1" level="project" />
122+
<orderEntry type="library" exported="" name="support-vector-drawable-24.2.1" level="project" />
123+
<orderEntry type="library" exported="" name="support-core-utils-24.2.1" level="project" />
96124
<orderEntry type="module" module-name="library" exported="" />
125+
<orderEntry type="library" exported="" scope="TEST" name="hamcrest-core-1.3" level="project" />
126+
<orderEntry type="library" exported="" scope="TEST" name="junit-4.12" level="project" />
97127
</component>
98128
</module>

‎app/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
apply plugin: 'com.android.application'
22

33
android {
4-
compileSdkVersion 23
5-
buildToolsVersion "23.0.2"
4+
compileSdkVersion 24
5+
buildToolsVersion "24.0.2"
66

77
defaultConfig {
88
applicationId "com.yyy.djk.dropdownmenu"
99
minSdkVersion 14
10-
targetSdkVersion 23
10+
targetSdkVersion 24
1111
versionCode 1
1212
versionName "1.0"
1313
}
@@ -21,7 +21,7 @@ android {
2121

2222
dependencies {
2323
compile fileTree(dir: 'libs', include: ['*.jar'])
24-
compile 'com.android.support:appcompat-v7:23.1.1'
24+
compile 'com.android.support:appcompat-v7:24.2.1'
2525
compile 'com.jakewharton:butterknife:6.1.0'
2626
compile project(':library')
2727
}

‎app/src/main/res/layout/item_default_drop_down.xml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
11
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
2-
xmlns:tools="http://schemas.android.com/tools"
32
android:layout_width="match_parent"
43
android:layout_height="match_parent"
54
android:background="@color/white"
6-
android:orientation="vertical"
7-
tools:context="com.car.cslm.widget.drop_down_menu.DefaultDropDownAdapter">
5+
android:orientation="vertical">
86

97
<TextView
108
android:id="@+id/text"
119
android:layout_width="match_parent"
1210
android:layout_height="wrap_content"
13-
android:paddingBottom="10dp"
1411
android:gravity="center"
12+
android:paddingBottom="10dp"
1513
android:paddingLeft="25dp"
1614
android:paddingRight="25dp"
1715
android:paddingTop="10dp"

‎build.gradle

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,21 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
2-
32
buildscript {
43
repositories {
54
jcenter()
65
}
76
dependencies {
8-
classpath 'com.android.tools.build:gradle:2.2.0'
7+
classpath 'com.android.tools.build:gradle:2.2.0'
98
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5' // Add this line
109

1110
// NOTE: Do not place your application dependencies here; they belong
1211
// in the individual module build.gradle files
1312
}
1413
}
15-
1614
allprojects {
1715
repositories {
1816
jcenter()
1917
}
2018
}
19+
20+
dependencies {
21+
}

‎gradle/wrapper/gradle-wrapper.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Wed Oct 21 11:34:03 PDT 2015
1+
#Sat Oct 08 15:08:05 CST 2016
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-2.8-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip

‎library/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ apply plugin: 'com.github.dcendents.android-maven'
44
group = 'com.github.dongjunkun'
55

66
android {
7-
compileSdkVersion 23
8-
buildToolsVersion "23.0.2"
7+
compileSdkVersion 24
8+
buildToolsVersion "24.0.2"
99

1010
defaultConfig {
1111
minSdkVersion 11
12-
targetSdkVersion 23
12+
targetSdkVersion 24
1313
versionCode 1
1414
versionName "1.0"
1515
}
@@ -24,5 +24,5 @@ android {
2424
dependencies {
2525
compile fileTree(dir: 'libs', include: ['*.jar'])
2626
testCompile 'junit:junit:4.12'
27-
compile 'com.android.support:appcompat-v7:23.1.1'
27+
compile 'com.android.support:appcompat-v7:24.2.1'
2828
}

0 commit comments

Comments
 (0)