From 38fd2d2856107987b8e8315da0d6f9b355cb4e46 Mon Sep 17 00:00:00 2001 From: hzw <1993hzw@163.com> Date: Wed, 31 Aug 2016 01:12:51 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86gradle=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- GraffitiLib/build.gradle | 8 +++++--- app/build.gradle | 5 ++--- app/src/main/AndroidManifest.xml | 4 +--- .../main/java/cn/hzw/graffitidemo/MainActivity.java | 4 ++-- app/src/main/res/values/styles.xml | 11 ----------- local.properties | 10 ---------- 6 files changed, 10 insertions(+), 32 deletions(-) delete mode 100644 app/src/main/res/values/styles.xml delete mode 100644 local.properties diff --git a/GraffitiLib/build.gradle b/GraffitiLib/build.gradle index 0219b19..d534e38 100644 --- a/GraffitiLib/build.gradle +++ b/GraffitiLib/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'com.android.library' android { compileSdkVersion 23 - buildToolsVersion "23.0.3" + buildToolsVersion "23.0.1" defaultConfig { minSdkVersion 9 @@ -10,16 +10,18 @@ android { versionCode 1 versionName "1.0" } + /* buildTypes { release { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } + */ } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) + compile fileTree(include: ['*.jar'], dir: 'libs') testCompile 'junit:junit:4.12' - compile 'com.android.support:appcompat-v7:23.4.0' + compile 'com.android.support:support-v4:23.0.1' } diff --git a/app/build.gradle b/app/build.gradle index b7ae30e..a167578 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'com.android.application' android { compileSdkVersion 23 - buildToolsVersion "23.0.3" + buildToolsVersion "23.0.1" defaultConfig { applicationId "cn.hzw.graffitidemo" @@ -20,7 +20,6 @@ android { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) + compile fileTree(include: ['*.jar'], dir: 'libs') testCompile 'junit:junit:4.12' - compile 'com.android.support:appcompat-v7:23.4.0' } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index bc3edeb..c36ba79 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -5,9 +5,7 @@ + android:label="@string/app_name"> diff --git a/app/src/main/java/cn/hzw/graffitidemo/MainActivity.java b/app/src/main/java/cn/hzw/graffitidemo/MainActivity.java index 8d8b0ad..9570174 100644 --- a/app/src/main/java/cn/hzw/graffitidemo/MainActivity.java +++ b/app/src/main/java/cn/hzw/graffitidemo/MainActivity.java @@ -1,9 +1,9 @@ package cn.hzw.graffitidemo; -import android.support.v7.app.AppCompatActivity; +import android.app.Activity; import android.os.Bundle; -public class MainActivity extends AppCompatActivity { +public class MainActivity extends Activity { @Override protected void onCreate(Bundle savedInstanceState) { diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml deleted file mode 100644 index 5885930..0000000 --- a/app/src/main/res/values/styles.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - diff --git a/local.properties b/local.properties deleted file mode 100644 index 2c1d4be..0000000 --- a/local.properties +++ /dev/null @@ -1,10 +0,0 @@ -## This file is automatically generated by Android Studio. -# Do not modify this file -- YOUR CHANGES WILL BE ERASED! -# -# This file should *NOT* be checked into Version Control Systems, -# as it contains information specific to your local configuration. -# -# Location of the SDK. This is only used by Gradle. -# For customization when using a Version Control System, please read the -# header note. -sdk.dir=/home/huangziwei/android-sdk-linux \ No newline at end of file -- GitLab