Gradle 1.12

* Gradle plugin 0.10
* Target SDK 19
* Abandon robolectric
pull/143/head
Alex Baker 10 years ago
parent 5bd5713508
commit 2d277a38ca

@ -11,5 +11,4 @@ before_install:
- adb shell input keyevent 82 & - adb shell input keyevent 82 &
script: script:
- ./gradlew test
- ./gradlew connectedAndroidTest - ./gradlew connectedAndroidTest

@ -1,7 +1,7 @@
Visit the wiki to [get started with development](https://github.com/abaker/tasks/wiki/Getting-Started-with-Development). [![Make a contribution](https://pledgie.com/campaigns/24281.png?skin_name=chrome)](https://pledgie.com/campaigns/24281)
[![Build Status](https://travis-ci.org/abaker/tasks.svg?branch=master)](https://travis-ci.org/abaker/tasks)
[![Get it on Google Play](https://developer.android.com/images/brand/en_generic_rgb_wo_45.png)](https://play.google.com/store/apps/details?id=org.tasks) [![Get it on Google Play](https://developer.android.com/images/brand/en_generic_rgb_wo_45.png)](https://play.google.com/store/apps/details?id=org.tasks)
[![Make a contribution](https://pledgie.com/campaigns/24281.png?skin_name=chrome)](https://pledgie.com/campaigns/24281) [![Build Status](https://travis-ci.org/abaker/tasks.svg?branch=master)](https://travis-ci.org/abaker/tasks)
Visit the wiki to [get started with development](https://github.com/abaker/tasks/wiki/Getting-Started-with-Development).

@ -3,7 +3,7 @@ buildscript {
mavenCentral() mavenCentral()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:0.9.+' classpath 'com.android.tools.build:gradle:0.10.+'
} }
} }
@ -24,7 +24,7 @@ android {
defaultConfig { defaultConfig {
minSdkVersion 7 minSdkVersion 7
targetSdkVersion 18 targetSdkVersion 19
} }
} }

@ -8,8 +8,6 @@
<uses-permission android:name="android.permission.RECORD_AUDIO" /> <uses-permission android:name="android.permission.RECORD_AUDIO" />
<uses-permission android:name="android.permission.INTERNET"/> <uses-permission android:name="android.permission.INTERNET"/>
<uses-sdk android:minSdkVersion="7" />
<application <application
android:icon="@drawable/ic_launcher" android:icon="@drawable/ic_launcher"
android:label="@string/app_name" > android:label="@string/app_name" >

@ -3,7 +3,7 @@ buildscript {
mavenCentral() mavenCentral()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:0.9.+' classpath 'com.android.tools.build:gradle:0.10.+'
} }
} }
@ -27,7 +27,7 @@ android {
defaultConfig { defaultConfig {
minSdkVersion 7 minSdkVersion 7
targetSdkVersion 18 targetSdkVersion 19
} }
} }

@ -8,7 +8,4 @@
package="org.tasks.api" package="org.tasks.api"
android:versionCode="1" android:versionCode="1"
android:versionName="1.0"> android:versionName="1.0">
</manifest>
<uses-sdk android:minSdkVersion="3" />
</manifest>

@ -1,24 +1,16 @@
buildscript { buildscript {
repositories { repositories {
mavenCentral() mavenCentral()
maven {
url 'https://oss.sonatype.org/content/repositories/snapshots/'
}
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:0.9.+' classpath 'com.android.tools.build:gradle:0.10.+'
classpath 'com.squareup.gradle:gradle-android-test-plugin:0.9.1-SNAPSHOT'
} }
} }
apply plugin: 'android' apply plugin: 'android'
apply plugin: 'android-test'
repositories { repositories {
mavenCentral() mavenCentral()
maven {
url 'https://oss.sonatype.org/content/repositories/snapshots/'
}
} }
android { android {
@ -31,7 +23,7 @@ android {
defaultConfig { defaultConfig {
minSdkVersion 7 minSdkVersion 7
targetSdkVersion 18 targetSdkVersion 19
} }
signingConfigs { signingConfigs {
@ -99,11 +91,6 @@ dependencies {
compile group: 'com.google.oauth-client', name: 'google-oauth-client', version: '1.6.0-beta', transitive: false compile group: 'com.google.oauth-client', name: 'google-oauth-client', version: '1.6.0-beta', transitive: false
compile group: 'com.google.oauth-client', name: 'google-oauth-client-extensions', version: '1.6.0-beta', transitive: false compile group: 'com.google.oauth-client', name: 'google-oauth-client-extensions', version: '1.6.0-beta', transitive: false
testCompile group: 'junit', name: 'junit', version: '4.10'
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
androidTestCompile group: 'junit', name: 'junit', version: '4.10', 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 androidTestCompile group: 'org.mockito', name: 'mockito-core', version: '1.9.5', transitive: false
} }

@ -72,10 +72,6 @@
<!-- ========================================================== Metadata = --> <!-- ========================================================== Metadata = -->
<uses-sdk
android:targetSdkVersion="18"
android:minSdkVersion="7" />
<supports-screens <supports-screens
android:xlargeScreens="true" android:xlargeScreens="true"
android:largeScreens="true" /> android:largeScreens="true" />

@ -1,3 +1,3 @@
task wrapper(type: Wrapper) { task wrapper(type: Wrapper) {
gradleVersion = '1.10' gradleVersion = '1.12'
} }

Binary file not shown.

@ -1,6 +1,6 @@
#Fri Mar 07 10:32:46 CST 2014 #Mon May 12 12:57:48 CDT 2014
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=http\://services.gradle.org/distributions/gradle-1.11-all.zip distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-all.zip

Loading…
Cancel
Save