diff --git a/android-aac-enc/build.gradle b/android-aac-enc/build.gradle index 4f75483c0..9e634bc98 100644 --- a/android-aac-enc/build.gradle +++ b/android-aac-enc/build.gradle @@ -3,7 +3,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:0.8.+' + classpath 'com.android.tools.build:gradle:0.9.+' } } @@ -15,7 +15,7 @@ repositories { android { compileSdkVersion 19 - buildToolsVersion "19.0.1" + buildToolsVersion "19.0.3" compileOptions { sourceCompatibility JavaVersion.VERSION_1_7 diff --git a/api/build.gradle b/api/build.gradle index bcd8c4be1..f49eea41f 100644 --- a/api/build.gradle +++ b/api/build.gradle @@ -3,7 +3,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:0.8.+' + classpath 'com.android.tools.build:gradle:0.9.+' } } @@ -18,7 +18,7 @@ android { lintConfig file("../lint.xml") } compileSdkVersion 19 - buildToolsVersion "19.0.1" + buildToolsVersion "19.0.3" compileOptions { sourceCompatibility JavaVersion.VERSION_1_7 diff --git a/astrid/build.gradle b/astrid/build.gradle index ded43fb2e..8d6f8ae88 100644 --- a/astrid/build.gradle +++ b/astrid/build.gradle @@ -6,7 +6,7 @@ buildscript { } } dependencies { - classpath 'com.android.tools.build:gradle:0.8.+' + classpath 'com.android.tools.build:gradle:0.9.+' classpath 'com.squareup.gradle:gradle-android-test-plugin:0.9.1-SNAPSHOT' } } @@ -27,7 +27,7 @@ android { } compileSdkVersion 19 - buildToolsVersion "19.0.1" + buildToolsVersion "19.0.3" defaultConfig { minSdkVersion 7 @@ -103,7 +103,7 @@ dependencies { testCompile group: 'org.robolectric', name: 'robolectric', version: '2.3-SNAPSHOT' testCompile group: 'org.mockito', name: 'mockito-all', version: '1.9.5' // hack to get android studio to import libraries - instrumentTestCompile group: 'junit', name: 'junit', version: '4.10', transitive: false - instrumentTestCompile group: 'org.robolectric', name: 'robolectric', version: '2.3-SNAPSHOT', transitive: false - instrumentTestCompile group: 'org.mockito', name: 'mockito-core', version: '1.9.5', transitive: false + androidTestCompile group: 'junit', name: 'junit', version: '4.10', transitive: false + androidTestCompile group: 'org.robolectric', name: 'robolectric', version: '2.3-SNAPSHOT', transitive: false + androidTestCompile group: 'org.mockito', name: 'mockito-core', version: '1.9.5', transitive: false } diff --git a/astrid/src/instrumentTest/java/com/todoroo/andlib/service/TestDependencyInjector.java b/astrid/src/androidTest/java/com/todoroo/andlib/service/TestDependencyInjector.java similarity index 100% rename from astrid/src/instrumentTest/java/com/todoroo/andlib/service/TestDependencyInjector.java rename to astrid/src/androidTest/java/com/todoroo/andlib/service/TestDependencyInjector.java diff --git a/astrid/src/instrumentTest/java/com/todoroo/andlib/test/TodorooTestCase.java b/astrid/src/androidTest/java/com/todoroo/andlib/test/TodorooTestCase.java similarity index 100% rename from astrid/src/instrumentTest/java/com/todoroo/andlib/test/TodorooTestCase.java rename to astrid/src/androidTest/java/com/todoroo/andlib/test/TodorooTestCase.java diff --git a/astrid/src/instrumentTest/java/com/todoroo/andlib/test/TodorooTestCaseWithInjector.java b/astrid/src/androidTest/java/com/todoroo/andlib/test/TodorooTestCaseWithInjector.java similarity index 100% rename from astrid/src/instrumentTest/java/com/todoroo/andlib/test/TodorooTestCaseWithInjector.java rename to astrid/src/androidTest/java/com/todoroo/andlib/test/TodorooTestCaseWithInjector.java diff --git a/astrid/src/instrumentTest/java/com/todoroo/astrid/AllTests.java b/astrid/src/androidTest/java/com/todoroo/astrid/AllTests.java similarity index 100% rename from astrid/src/instrumentTest/java/com/todoroo/astrid/AllTests.java rename to astrid/src/androidTest/java/com/todoroo/astrid/AllTests.java diff --git a/astrid/src/instrumentTest/java/com/todoroo/astrid/backup/BackupServiceTests.java b/astrid/src/androidTest/java/com/todoroo/astrid/backup/BackupServiceTests.java similarity index 100% rename from astrid/src/instrumentTest/java/com/todoroo/astrid/backup/BackupServiceTests.java rename to astrid/src/androidTest/java/com/todoroo/astrid/backup/BackupServiceTests.java diff --git a/astrid/src/instrumentTest/java/com/todoroo/astrid/dao/MetadataDaoTests.java b/astrid/src/androidTest/java/com/todoroo/astrid/dao/MetadataDaoTests.java similarity index 100% rename from astrid/src/instrumentTest/java/com/todoroo/astrid/dao/MetadataDaoTests.java rename to astrid/src/androidTest/java/com/todoroo/astrid/dao/MetadataDaoTests.java diff --git a/astrid/src/instrumentTest/java/com/todoroo/astrid/dao/TaskDaoTests.java b/astrid/src/androidTest/java/com/todoroo/astrid/dao/TaskDaoTests.java similarity index 100% rename from astrid/src/instrumentTest/java/com/todoroo/astrid/dao/TaskDaoTests.java rename to astrid/src/androidTest/java/com/todoroo/astrid/dao/TaskDaoTests.java diff --git a/astrid/src/instrumentTest/java/com/todoroo/astrid/gtasks/GtasksIndentActionTest.java b/astrid/src/androidTest/java/com/todoroo/astrid/gtasks/GtasksIndentActionTest.java similarity index 100% rename from astrid/src/instrumentTest/java/com/todoroo/astrid/gtasks/GtasksIndentActionTest.java rename to astrid/src/androidTest/java/com/todoroo/astrid/gtasks/GtasksIndentActionTest.java diff --git a/astrid/src/instrumentTest/java/com/todoroo/astrid/gtasks/GtasksMetadataServiceTest.java b/astrid/src/androidTest/java/com/todoroo/astrid/gtasks/GtasksMetadataServiceTest.java similarity index 100% rename from astrid/src/instrumentTest/java/com/todoroo/astrid/gtasks/GtasksMetadataServiceTest.java rename to astrid/src/androidTest/java/com/todoroo/astrid/gtasks/GtasksMetadataServiceTest.java diff --git a/astrid/src/instrumentTest/java/com/todoroo/astrid/gtasks/GtasksTaskListUpdaterTest.java b/astrid/src/androidTest/java/com/todoroo/astrid/gtasks/GtasksTaskListUpdaterTest.java similarity index 100% rename from astrid/src/instrumentTest/java/com/todoroo/astrid/gtasks/GtasksTaskListUpdaterTest.java rename to astrid/src/androidTest/java/com/todoroo/astrid/gtasks/GtasksTaskListUpdaterTest.java diff --git a/astrid/src/instrumentTest/java/com/todoroo/astrid/gtasks/GtasksTaskMovingTest.java b/astrid/src/androidTest/java/com/todoroo/astrid/gtasks/GtasksTaskMovingTest.java similarity index 100% rename from astrid/src/instrumentTest/java/com/todoroo/astrid/gtasks/GtasksTaskMovingTest.java rename to astrid/src/androidTest/java/com/todoroo/astrid/gtasks/GtasksTaskMovingTest.java diff --git a/astrid/src/instrumentTest/java/com/todoroo/astrid/gtasks/GtasksTestPreferenceService.java b/astrid/src/androidTest/java/com/todoroo/astrid/gtasks/GtasksTestPreferenceService.java similarity index 100% rename from astrid/src/instrumentTest/java/com/todoroo/astrid/gtasks/GtasksTestPreferenceService.java rename to astrid/src/androidTest/java/com/todoroo/astrid/gtasks/GtasksTestPreferenceService.java diff --git a/astrid/src/instrumentTest/java/com/todoroo/astrid/provider/Astrid3ProviderTests.java b/astrid/src/androidTest/java/com/todoroo/astrid/provider/Astrid3ProviderTests.java similarity index 100% rename from astrid/src/instrumentTest/java/com/todoroo/astrid/provider/Astrid3ProviderTests.java rename to astrid/src/androidTest/java/com/todoroo/astrid/provider/Astrid3ProviderTests.java diff --git a/astrid/src/instrumentTest/java/com/todoroo/astrid/reminders/NotificationTests.java b/astrid/src/androidTest/java/com/todoroo/astrid/reminders/NotificationTests.java similarity index 100% rename from astrid/src/instrumentTest/java/com/todoroo/astrid/reminders/NotificationTests.java rename to astrid/src/androidTest/java/com/todoroo/astrid/reminders/NotificationTests.java diff --git a/astrid/src/instrumentTest/java/com/todoroo/astrid/repeats/NewRepeatTests.java b/astrid/src/androidTest/java/com/todoroo/astrid/repeats/NewRepeatTests.java similarity index 100% rename from astrid/src/instrumentTest/java/com/todoroo/astrid/repeats/NewRepeatTests.java rename to astrid/src/androidTest/java/com/todoroo/astrid/repeats/NewRepeatTests.java diff --git a/astrid/src/instrumentTest/java/com/todoroo/astrid/service/QuickAddMarkupTest.java b/astrid/src/androidTest/java/com/todoroo/astrid/service/QuickAddMarkupTest.java similarity index 100% rename from astrid/src/instrumentTest/java/com/todoroo/astrid/service/QuickAddMarkupTest.java rename to astrid/src/androidTest/java/com/todoroo/astrid/service/QuickAddMarkupTest.java diff --git a/astrid/src/instrumentTest/java/com/todoroo/astrid/service/TitleParserTest.java b/astrid/src/androidTest/java/com/todoroo/astrid/service/TitleParserTest.java similarity index 100% rename from astrid/src/instrumentTest/java/com/todoroo/astrid/service/TitleParserTest.java rename to astrid/src/androidTest/java/com/todoroo/astrid/service/TitleParserTest.java diff --git a/astrid/src/instrumentTest/java/com/todoroo/astrid/subtasks/SubtasksHelperTest.java b/astrid/src/androidTest/java/com/todoroo/astrid/subtasks/SubtasksHelperTest.java similarity index 100% rename from astrid/src/instrumentTest/java/com/todoroo/astrid/subtasks/SubtasksHelperTest.java rename to astrid/src/androidTest/java/com/todoroo/astrid/subtasks/SubtasksHelperTest.java diff --git a/astrid/src/instrumentTest/java/com/todoroo/astrid/subtasks/SubtasksMovingTest.java b/astrid/src/androidTest/java/com/todoroo/astrid/subtasks/SubtasksMovingTest.java similarity index 100% rename from astrid/src/instrumentTest/java/com/todoroo/astrid/subtasks/SubtasksMovingTest.java rename to astrid/src/androidTest/java/com/todoroo/astrid/subtasks/SubtasksMovingTest.java diff --git a/astrid/src/instrumentTest/java/com/todoroo/astrid/subtasks/SubtasksTestCase.java b/astrid/src/androidTest/java/com/todoroo/astrid/subtasks/SubtasksTestCase.java similarity index 100% rename from astrid/src/instrumentTest/java/com/todoroo/astrid/subtasks/SubtasksTestCase.java rename to astrid/src/androidTest/java/com/todoroo/astrid/subtasks/SubtasksTestCase.java diff --git a/astrid/src/instrumentTest/java/com/todoroo/astrid/sync/NewSyncTestCase.java b/astrid/src/androidTest/java/com/todoroo/astrid/sync/NewSyncTestCase.java similarity index 100% rename from astrid/src/instrumentTest/java/com/todoroo/astrid/sync/NewSyncTestCase.java rename to astrid/src/androidTest/java/com/todoroo/astrid/sync/NewSyncTestCase.java diff --git a/astrid/src/instrumentTest/java/com/todoroo/astrid/sync/SyncModelTest.java b/astrid/src/androidTest/java/com/todoroo/astrid/sync/SyncModelTest.java similarity index 100% rename from astrid/src/instrumentTest/java/com/todoroo/astrid/sync/SyncModelTest.java rename to astrid/src/androidTest/java/com/todoroo/astrid/sync/SyncModelTest.java diff --git a/astrid/src/instrumentTest/java/com/todoroo/astrid/test/DatabaseTestCase.java b/astrid/src/androidTest/java/com/todoroo/astrid/test/DatabaseTestCase.java similarity index 100% rename from astrid/src/instrumentTest/java/com/todoroo/astrid/test/DatabaseTestCase.java rename to astrid/src/androidTest/java/com/todoroo/astrid/test/DatabaseTestCase.java diff --git a/astrid/src/instrumentTest/java/com/zutubi/android/junitreport/Compatibility.java b/astrid/src/androidTest/java/com/zutubi/android/junitreport/Compatibility.java similarity index 100% rename from astrid/src/instrumentTest/java/com/zutubi/android/junitreport/Compatibility.java rename to astrid/src/androidTest/java/com/zutubi/android/junitreport/Compatibility.java diff --git a/astrid/src/instrumentTest/java/com/zutubi/android/junitreport/JUnitReportListener.java b/astrid/src/androidTest/java/com/zutubi/android/junitreport/JUnitReportListener.java similarity index 100% rename from astrid/src/instrumentTest/java/com/zutubi/android/junitreport/JUnitReportListener.java rename to astrid/src/androidTest/java/com/zutubi/android/junitreport/JUnitReportListener.java diff --git a/astrid/src/instrumentTest/java/com/zutubi/android/junitreport/JUnitReportTestRunner.java b/astrid/src/androidTest/java/com/zutubi/android/junitreport/JUnitReportTestRunner.java similarity index 100% rename from astrid/src/instrumentTest/java/com/zutubi/android/junitreport/JUnitReportTestRunner.java rename to astrid/src/androidTest/java/com/zutubi/android/junitreport/JUnitReportTestRunner.java diff --git a/astrid/src/instrumentTest/res/.do.not.delete b/astrid/src/androidTest/res/.do.not.delete similarity index 100% rename from astrid/src/instrumentTest/res/.do.not.delete rename to astrid/src/androidTest/res/.do.not.delete diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 5b8876320..042402038 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Thu Jan 23 22:07:16 CST 2014 +#Fri Mar 07 10:32:46 CST 2014 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-all.zip +distributionUrl=http\://services.gradle.org/distributions/gradle-1.11-all.zip