diff --git a/Driibo/build.gradle b/Driibo/build.gradle index f32af51..79a7b7a 100644 --- a/Driibo/build.gradle +++ b/Driibo/build.gradle @@ -3,21 +3,21 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:0.5.+' + classpath 'com.android.tools.build:gradle:0.12.2' } } -apply plugin: 'android' +apply plugin: 'com.android.application' repositories { mavenCentral() } dependencies { - compile 'com.android.support:support-v4:18.0.+' + compile 'com.android.support:support-v4:19.1.0' compile 'com.google.code.gson:gson:2.2.4' + compile files('libs/volley.jar') compile project(':extras:ActionBar-PullToRefresh') compile project(':extras:ListViewAnimationLib') - compile files('libs/volley.jar') } tasks.withType(Compile) { @@ -29,7 +29,7 @@ int VERSION_CODE = 3 android { compileSdkVersion 17 - buildToolsVersion "17.0.0" + buildToolsVersion '19.1.0' defaultConfig { minSdkVersion 14 @@ -47,9 +47,31 @@ android { } } + signingConfigs { + signing + } + buildTypes { release { - signingConfig signingConfigs.driibo + if (project.hasProperty('storeFile')) { + signingConfig signingConfigs.signing + } } } } + +if (project.hasProperty('storeFile')) { + android.signingConfigs.signing.storeFile = file(storeFile) +} + +if (project.hasProperty('storePassword')) { + android.signingConfigs.signing.storePassword = storePassword +} + +if (project.hasProperty('keyAlias')) { + android.signingConfigs.signing.keyAlias = keyAlias +} + +if (project.hasProperty('keyPassword')) { + android.signingConfigs.signing.keyPassword = keyPassword +} diff --git a/Driibo/gradle.properties b/Driibo/gradle.properties new file mode 100644 index 0000000..66f7067 --- /dev/null +++ b/Driibo/gradle.properties @@ -0,0 +1,4 @@ +storeFile= ../RefacTech.keystore +storePassword= RefacTech +keyAlias= Driibo +keyPassword= RefacTech \ No newline at end of file diff --git a/Driibo/src/main/AndroidManifest.xml b/Driibo/src/main/AndroidManifest.xml index 9450604..8fbfb39 100644 --- a/Driibo/src/main/AndroidManifest.xml +++ b/Driibo/src/main/AndroidManifest.xml @@ -30,7 +30,7 @@ android:name=".ui.MainActivity" android:configChanges="screenSize|orientation" android:label="@string/app_name"> - r + diff --git a/Driibo/src/main/java/com/refactech/driibo/data/GsonRequest.java b/Driibo/src/main/java/com/refactech/driibo/data/GsonRequest.java index 8d920d8..1fd0f92 100644 --- a/Driibo/src/main/java/com/refactech/driibo/data/GsonRequest.java +++ b/Driibo/src/main/java/com/refactech/driibo/data/GsonRequest.java @@ -37,6 +37,8 @@ public GsonRequest(String url, Class clazz, Map headers, this.clazz = clazz; this.headers = headers; this.listener = listener; + + } @Override diff --git a/Driibo/src/main/java/com/refactech/driibo/ui/MainActivity.java b/Driibo/src/main/java/com/refactech/driibo/ui/MainActivity.java index b41e141..b02f565 100644 --- a/Driibo/src/main/java/com/refactech/driibo/ui/MainActivity.java +++ b/Driibo/src/main/java/com/refactech/driibo/ui/MainActivity.java @@ -3,9 +3,11 @@ import com.refactech.driibo.R; import com.refactech.driibo.type.dribble.Category; -import com.refactech.driibo.ui.fragment.*; - -import uk.co.senab.actionbarpulltorefresh.library.PullToRefreshAttacher; +import com.refactech.driibo.ui.fragment.BasePageListFragment; +import com.refactech.driibo.ui.fragment.DrawerFragment; +import com.refactech.driibo.ui.fragment.FollowingFragment; +import com.refactech.driibo.ui.fragment.LikeFragment; +import com.refactech.driibo.ui.fragment.ShotsFragment; import android.app.ActionBar; import android.content.Intent; @@ -22,6 +24,8 @@ import android.view.View; import android.view.Window; +import uk.co.senab.actionbarpulltorefresh.library.PullToRefreshAttacher; + public class MainActivity extends FragmentActivity { private DrawerLayout mDrawerLayout; diff --git a/extras/ActionBar-PullToRefresh/build.gradle b/extras/ActionBar-PullToRefresh/build.gradle index 96eb7e1..22ebd19 100644 --- a/extras/ActionBar-PullToRefresh/build.gradle +++ b/extras/ActionBar-PullToRefresh/build.gradle @@ -3,7 +3,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:0.5.+' + classpath 'com.android.tools.build:gradle:0.12.2' } } apply plugin: 'android-library' @@ -17,7 +17,7 @@ tasks.withType(Compile) { android { compileSdkVersion 17 - buildToolsVersion "17" + buildToolsVersion '19.1.0' defaultConfig { minSdkVersion 14 diff --git a/extras/ListViewAnimationLib/build.gradle b/extras/ListViewAnimationLib/build.gradle index 748aed8..2e08456 100644 --- a/extras/ListViewAnimationLib/build.gradle +++ b/extras/ListViewAnimationLib/build.gradle @@ -3,7 +3,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:0.5.+' + classpath 'com.android.tools.build:gradle:0.12.2' } } apply plugin: 'android-library' @@ -13,7 +13,7 @@ dependencies { android { compileSdkVersion 17 - buildToolsVersion "17" + buildToolsVersion '19.1.0' defaultConfig { minSdkVersion 14 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 5c22dec..3cee42c 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Apr 10 15:27:10 PDT 2013 +#Sat Aug 23 20:25:10 CST 2014 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=http\://services.gradle.org/distributions/gradle-1.6-bin.zip +distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-all.zip