diff --git a/build.gradle b/build.gradle index f64bfced6..26b9940ca 100644 --- a/build.gradle +++ b/build.gradle @@ -21,7 +21,7 @@ buildscript { maven { url "http://oss.sonatype.org/content/repositories/snapshots/" } } dependencies { - classpath 'com.android.tools.build:gradle:1.4.0-beta4' + classpath 'com.android.tools.build:gradle:1.5.0-beta2' classpath 'com.neenbedankt.gradle.plugins:android-apt:1.7' classpath 'me.tatarka:gradle-retrolambda:3.2.3' classpath 'me.tatarka.retrolambda.projectlombok:lombok.ast:0.2.3.a2' diff --git a/settings.gradle b/settings.gradle index 64244d448..287b67736 100644 --- a/settings.gradle +++ b/settings.gradle @@ -14,6 +14,4 @@ * If you have questions regarding the use of this file, please contact * Ushahidi developers at team@ushahidi.com. */ - -include ':libraries:pay-me', ':libraries:survey-dialog', ':sms-portals' include ':smssync' diff --git a/smssync/build.gradle b/smssync/build.gradle index 43082f130..7215e458c 100644 --- a/smssync/build.gradle +++ b/smssync/build.gradle @@ -226,7 +226,7 @@ if (project.hasProperty('releaseKeyStore') && android.signingConfigs.releaseSign.keyPassword "" } -tasks.release.dependsOn(['build', 'publishApkWithAnalyticsRelease']) +tasks.release.dependsOn(['publishApkWithAnalyticsRelease']) // Build and launch app from command line task runApp(type: Exec, dependsOn: ['build', 'installWithAnalyticsDebug']) { @@ -239,8 +239,6 @@ dependencies { def appDependencies = rootProject.ext.appDependencies def appTestDependencies = rootProject.ext.appTestDependencies apt appDependencies.daggerCompiler // Needed for source code generation - compile project(':libraries:pay-me') - compile project(':libraries:survey-dialog') compile fileTree(dir: 'libs', include: '*.jar') compile(appDependencies.raiburari) { exclude module: 'recyclerview-v7' diff --git a/smssync/src/main/AndroidManifest.xml b/smssync/src/main/AndroidManifest.xml index b7e2e9641..e691070f8 100644 --- a/smssync/src/main/AndroidManifest.xml +++ b/smssync/src/main/AndroidManifest.xml @@ -29,7 +29,6 @@ -