Skip to content

Commit a24fa88

Browse files
thinaaronthinaaron
committed
提升 gradle 版本，修改编译错误
1 parent 2f20d1e commit a24fa88

6 files changed

Lines changed: 17 additions & 30 deletions

File tree

‎app/build.gradle‎

Lines changed: 9 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,14 @@ android {
6666
}
6767

6868
dependencies {
69+
def supportVersion = '25.2.0'
6970
compile fileTree(include: ['*.jar'], dir: 'libs')
70-
compile 'com.android.support:support-v4:23.1.1'
71-
compile 'com.android.support:appcompat-v7:23.1.1'
71+
72+
compile "com.android.support:cardview-v7:$supportVersion"
73+
compile "com.android.support:appcompat-v7:$supportVersion"
74+
compile "com.android.support:support-v4:$supportVersion"
75+
compile "com.android.support:design:$supportVersion"
76+
7277
compile 'com.android.support:multidex:1.0.1'
7378
compile 'com.skyfishjy.ripplebackground:library:1.0.1'
7479
compile 'com.loopj.android:android-async-http:1.4.9'
@@ -82,10 +87,8 @@ dependencies {
8287
compile 'com.melnykov:floatingactionbutton:1.3.0'
8388
compile 'org.greenrobot:eventbus:3.0.0'
8489
compile 'pl.droidsonroids.gif:android-gif-drawable:1.1.11'
85-
compile 'com.android.support:support-v13:23.1.1'
8690
compile 'com.ms-square:etsyblur:0.1.0'
8791
compile 'com.github.lzyzsd:circleprogress:1.1.0@aar'
88-
compile 'com.android.support:cardview-v7:23.1.1'
8992
compile 'it.neokree:MaterialNavigationDrawer:1.3.2'
9093
compile files('libs/BaiduLBS_Android.jar')
9194
compile 'com.prolificinteractive:parallaxpager:2.2.1'
@@ -101,15 +104,14 @@ dependencies {
101104
// compile 'com.twotoasters.jazzylistview:library:1.2.1'
102105
compile project(':social_sdk_library_project')
103106
compile 'com.bigkoo:convenientbanner:1.0.8'
104-
compile 'com.android.support:design:23.1.1'
105107
compile files('libs/pinyin4j-2.5.0.jar')
106108
compile files('libs/jg_filter_sdk_1.1.jar')
107109
compile files('libs/wup-1.0.0.E-SNAPSHOT.jar')
108110
compile project(':bottom-bar')
109111
compile 'com.alibaba:fastjson:1.1.44.android'
110112
compile 'com.flyco.roundview:FlycoRoundView_Lib:1.1.4@aar'
111113
compile 'com.marshalchen.ultimaterecyclerview:library:0.7.0'
112-
compile 'com.tbruyelle.rxpermissions:rxpermissions:0.9.1@aar'
114+
compile 'com.tbruyelle.rxpermissions:rxpermissions:0.9.3@aar'
113115
compile 'org.eclipse.jgit:org.eclipse.jgit:3.7.1.201504261725-r'
114116
compile 'com.orhanobut:logger:1.15'
115117
compile files('libs/Xg_sdk_v2.47_20161026_0936.jar')
@@ -139,30 +141,16 @@ dependencies {
139141

140142
apt {
141143
arguments {
142-
// androidManifestFile variant.outputs[0].processResources.manifestFile
143-
// resourcePackageName "$android.defaultConfig.applicationId"
144-
// resourcePackageName 'coding.net.program'
145-
146-
// androidManifestFile variant.outputs[0]?.processResources?.manifestFile
147-
// if you have multiple outputs (when using splits), you may want to have other index than 0
148-
149-
// you should set your package name here if you are using different application IDs
150-
// resourcePackageName "$android.defaultConfig.applicationId"
151144
resourcePackageName "net.coding.program"
152145

153-
// logLevel "TRACE"
154-
// logAppenderConsole "true"
155146
}
156147
}
157148

158149
repositories {
159150
flatDir {
160-
dirs 'libs' //this way we can find the .aar file in libs folder
151+
dirs 'libs'
161152
}
162153
}
163-
dependencies {
164-
compile 'com.android.support:support-v4:23.+'
165-
}
166154
dependencies {
167155
compile(name: 'checknetwork', ext: 'aar')
168156
}

‎app/src/main/java/net/coding/program/message/UsersListFragment.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,7 @@ public View getView(int position, View convertView, ViewGroup parent) {
9696
if (convertView == null) {
9797
convertView = mInflater.inflate(R.layout.fragment_message_user_list_item, parent, false);
9898
holder = new ViewHolder();
99-
holder.icon =
100-
(ImageView) convertView.findViewById(R.id.icon);
99+
holder.icon = (ImageView) convertView.findViewById(R.id.icon);
101100
holder.icon.setFocusable(false);
102101
holder.title = (TextView) convertView.findViewById(R.id.title);
103102
holder.content = (TextView) convertView.findViewById(R.id.comment);

‎bottom-bar/build.gradle‎

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

33
android {
4-
compileSdkVersion 23
5-
buildToolsVersion "23.0.3"
4+
compileSdkVersion 25
5+
buildToolsVersion "25.0.2"
66

77
buildTypes {
88
debug {

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ buildscript {
55
jcenter()
66
}
77
dependencies {
8-
classpath 'com.android.tools.build:gradle:2.2.3'
8+
classpath 'com.android.tools.build:gradle:2.3.0'
99
classpath 'com.google.gms:google-services:1.4.0-beta3'
1010
// classpath "com.android.databinding:dataBinder:1.+"
1111
// NOTE: Do not place your application dependencies here; they belong

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ 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.14.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip

‎social_sdk_library_project/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ buildscript {
33
jcenter()
44
}
55
dependencies {
6-
classpath 'com.android.tools.build:gradle:2.2.2'
6+
classpath 'com.android.tools.build:gradle:2.3.0'
77
}
88
}
99
apply plugin: 'com.android.library'
@@ -13,8 +13,8 @@ dependencies {
1313
}
1414

1515
android {
16-
compileSdkVersion 23
17-
buildToolsVersion '23.0.3'
16+
compileSdkVersion 25
17+
buildToolsVersion '25.0.2'
1818

1919
sourceSets {
2020
main {

0 commit comments

Comments
 (0)