Skip to content

Commit 3094061

Browse files
author
Issac
committed
Fix build issues.
1 parent 67917b8 commit 3094061

File tree

8 files changed

+48
-16
lines changed

8 files changed

+48
-16
lines changed

Driibo/build.gradle

Lines changed: 28 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,21 @@ buildscript {
33
mavenCentral()
44
}
55
dependencies {
6-
classpath 'com.android.tools.build:gradle:0.5.+'
6+
classpath 'com.android.tools.build:gradle:0.12.2'
77
}
88
}
9-
apply plugin: 'android'
9+
apply plugin: 'com.android.application'
1010

1111
repositories {
1212
mavenCentral()
1313
}
1414

1515
dependencies {
16-
compile 'com.android.support:support-v4:18.0.+'
16+
compile 'com.android.support:support-v4:19.1.0'
1717
compile 'com.google.code.gson:gson:2.2.4'
18+
compile files('libs/volley.jar')
1819
compile project(':extras:ActionBar-PullToRefresh')
1920
compile project(':extras:ListViewAnimationLib')
20-
compile files('libs/volley.jar')
2121
}
2222

2323
tasks.withType(Compile) {
@@ -29,7 +29,7 @@ int VERSION_CODE = 3
2929

3030
android {
3131
compileSdkVersion 17
32-
buildToolsVersion "17.0.0"
32+
buildToolsVersion '19.1.0'
3333

3434
defaultConfig {
3535
minSdkVersion 14
@@ -47,9 +47,31 @@ android {
4747
}
4848
}
4949

50+
signingConfigs {
51+
signing
52+
}
53+
5054
buildTypes {
5155
release {
52-
signingConfig signingConfigs.driibo
56+
if (project.hasProperty('storeFile')) {
57+
signingConfig signingConfigs.signing
58+
}
5359
}
5460
}
5561
}
62+
63+
if (project.hasProperty('storeFile')) {
64+
android.signingConfigs.signing.storeFile = file(storeFile)
65+
}
66+
67+
if (project.hasProperty('storePassword')) {
68+
android.signingConfigs.signing.storePassword = storePassword
69+
}
70+
71+
if (project.hasProperty('keyAlias')) {
72+
android.signingConfigs.signing.keyAlias = keyAlias
73+
}
74+
75+
if (project.hasProperty('keyPassword')) {
76+
android.signingConfigs.signing.keyPassword = keyPassword
77+
}

Driibo/gradle.properties

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
storeFile= ../RefacTech.keystore
2+
storePassword= RefacTech
3+
keyAlias= Driibo
4+
keyPassword= RefacTech

Driibo/src/main/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
android:name=".ui.MainActivity"
3131
android:configChanges="screenSize|orientation"
3232
android:label="@string/app_name">
33-
<intent-filter>r
33+
<intent-filter>
3434
<action android:name="android.intent.action.MAIN"/>
3535

3636
<category android:name="android.intent.category.LAUNCHER"/>

Driibo/src/main/java/com/refactech/driibo/data/GsonRequest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ public GsonRequest(String url, Class<T> clazz, Map<String, String> headers,
3737
this.clazz = clazz;
3838
this.headers = headers;
3939
this.listener = listener;
40+
41+
4042
}
4143

4244
@Override

Driibo/src/main/java/com/refactech/driibo/ui/MainActivity.java

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,11 @@
33

44
import com.refactech.driibo.R;
55
import com.refactech.driibo.type.dribble.Category;
6-
import com.refactech.driibo.ui.fragment.*;
7-
8-
import uk.co.senab.actionbarpulltorefresh.library.PullToRefreshAttacher;
6+
import com.refactech.driibo.ui.fragment.BasePageListFragment;
7+
import com.refactech.driibo.ui.fragment.DrawerFragment;
8+
import com.refactech.driibo.ui.fragment.FollowingFragment;
9+
import com.refactech.driibo.ui.fragment.LikeFragment;
10+
import com.refactech.driibo.ui.fragment.ShotsFragment;
911

1012
import android.app.ActionBar;
1113
import android.content.Intent;
@@ -22,6 +24,8 @@
2224
import android.view.View;
2325
import android.view.Window;
2426

27+
import uk.co.senab.actionbarpulltorefresh.library.PullToRefreshAttacher;
28+
2529
public class MainActivity extends FragmentActivity {
2630
private DrawerLayout mDrawerLayout;
2731

extras/ActionBar-PullToRefresh/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ buildscript {
33
mavenCentral()
44
}
55
dependencies {
6-
classpath 'com.android.tools.build:gradle:0.5.+'
6+
classpath 'com.android.tools.build:gradle:0.12.2'
77
}
88
}
99
apply plugin: 'android-library'
@@ -17,7 +17,7 @@ tasks.withType(Compile) {
1717

1818
android {
1919
compileSdkVersion 17
20-
buildToolsVersion "17"
20+
buildToolsVersion '19.1.0'
2121

2222
defaultConfig {
2323
minSdkVersion 14

extras/ListViewAnimationLib/build.gradle

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

1414
android {
1515
compileSdkVersion 17
16-
buildToolsVersion "17"
16+
buildToolsVersion '19.1.0'
1717

1818
defaultConfig {
1919
minSdkVersion 14
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Wed Apr 10 15:27:10 PDT 2013
1+
#Sat Aug 23 20:25:10 CST 2014
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=http\://services.gradle.org/distributions/gradle-1.6-bin.zip
6+
distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-all.zip

0 commit comments

Comments
 (0)