aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Wong <wongma@protonmail.ch>2015-12-23 00:51:36 -0500
committerMatthew Wong <wongma@protonmail.ch>2015-12-23 00:51:36 -0500
commit23c5603b7f583687c9943276ae544701111ed90b (patch)
tree70895615a928030408b9489910383f28dd79c021
parent24b89992903ccc52dbe3191ff501028f4839762c (diff)
new gradle plugin and build tools
-rw-r--r--app/build.gradle2
-rw-r--r--app/src/main/AndroidManifest.xml4
-rw-r--r--build.gradle5
-rw-r--r--gradle/wrapper/gradle-wrapper.properties4
4 files changed, 6 insertions, 9 deletions
diff --git a/app/build.gradle b/app/build.gradle
index 62ce2c36..cda1ac19 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -4,7 +4,7 @@ apply plugin: 'eclipse'
android {
compileSdkVersion 23
- buildToolsVersion "23.0.1"
+ buildToolsVersion '23.0.2'
defaultConfig {
applicationId "com.zeapo.pwdstore"
minSdkVersion 15
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7aa45ca4..bd4c3704 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
package="com.zeapo.pwdstore">
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
@@ -9,8 +8,7 @@
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
<application android:allowBackup="true" android:icon="@drawable/ic_launcher"
- android:label="@string/app_name" android:theme="@style/AppTheme"
- tools:replace="android:theme">
+ android:label="@string/app_name" android:theme="@style/AppTheme">
<activity android:name=".PasswordStore" android:label="@string/app_name"
android:configChanges="orientation|screenSize">
<intent-filter>
diff --git a/build.gradle b/build.gradle
index 6fed505e..68dfe62b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
mavenCentral()
}
dependencies {
- classpath 'com.android.tools.build:gradle:1.3.0'
+ classpath 'com.android.tools.build:gradle:1.5.0'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
@@ -17,13 +17,12 @@ allprojects {
repositories {
jcenter()
mavenCentral()
- maven { url 'http://guardian.github.com/maven/repo-releases' }
}
}
ext {
compileSdkVersion = 23
- buildToolsVersion = "23.0.1"
+ buildToolsVersion = "23.0.2"
}
subprojects { subproject ->
afterEvaluate{
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 68e02ebb..1a704461 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Dec 04 19:46:18 CET 2014
+#Wed Dec 23 00:45:56 EST 2015
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.8-all.zip