Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 19 additions & 13 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,31 +3,37 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:0.6.+'
classpath 'com.android.tools.build:gradle:0.7.+'
}
}

apply plugin: 'android'

repositories {
mavenCentral()
maven { url 'http://wordpress-mobile.github.io/WordPress-Android' }
}

project.archivesBaseName="WordPress-Android"
apply plugin: 'android'

android {
lintOptions {
quiet true
abortOnError false
}

packagingOptions {
exclude "META-INF/LICENSE.txt"
exclude "META-INF/NOTICE.txt"
}

buildTypes {
release {
buildConfig "public static String APP_PN_KEY = \"org.wordpress.android.playstore\";"
buildConfigField "String", "APP_PN_KEY", "\"org.wordpress.android.playstore\""
}
debug {
buildConfig "public static String APP_PN_KEY = \"org.wordpress.android.debug.build\";"
buildConfigField "String", "APP_PN_KEY", "\"org.wordpress.android.debug.build\""
}
betagroup.initWith(buildTypes.release)
betagroup {
buildConfig "public static String APP_PN_KEY = \"org.wordpress.android.beta.build\";"
buildConfigField "String", "APP_PN_KEY", "\"org.wordpress.android.beta.build\""
}
}

Expand Down Expand Up @@ -85,7 +91,7 @@ android {

// Generates the Config.java class using properties defined in gradle.properties
// or by other means provided by Gradle
task wordpressConfig(group: "build", description: "Generate Config class") {
task generateWPConfig(group: "generate", description: "Generate Config class") {
def dir = "${buildDir}/source/wordpress"
def file = new File(dir, "org/wordpress/android/Config.java")
android {
Expand Down Expand Up @@ -128,13 +134,13 @@ ${config}
}
}

// Add the wordpressConfig task to every flavor's compile tasks
// Add the generateWPConfig task to every flavor's compile tasks
android.buildTypes.all { buildType ->
def name = "compile${buildType.name.capitalize()}"
def name = "generate${buildType.name.capitalize()}BuildConfig"
tasks.whenTaskAdded { task ->
if (task.name == name) {
task.dependsOn(wordpressConfig)
task.mustRunAfter(wordpressConfig)
task.dependsOn(generateWPConfig)
task.mustRunAfter(generateWPConfig)
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Mon Nov 04 14:37:56 PST 2013
#Thu Dec 19 13:13:21 CET 2013
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=http\://services.gradle.org/distributions/gradle-1.8-all.zip
distributionUrl=http\://services.gradle.org/distributions/gradle-1.9-all.zip
Binary file removed libs/android-support-v4.jar
Binary file not shown.
Binary file removed libs/commons-lang-2.6.jar
Binary file not shown.
Binary file removed libs/gcm.jar
Binary file not shown.
Binary file removed libs/gson-2.2.2.jar
Binary file not shown.
Binary file removed libs/httpmime-4.1.2.jar
Binary file not shown.
Binary file removed libs/tagsoup-1.2.1.jar
Binary file not shown.
Binary file removed libs/volley.jar
Binary file not shown.
Binary file removed libs/wordpresscom-android-rest-v0.0.3.jar
Binary file not shown.