Skip to content

Commit

Permalink
Merge pull request #5 from boyw165/master
Browse files Browse the repository at this point in the history
Update the SDK version so that it could be recognized by the latest AndroidStudio
  • Loading branch information
fedepaol committed Dec 20, 2016
2 parents 117a297 + 778a380 commit 727508b
Show file tree
Hide file tree
Showing 5 changed files with 48 additions and 107 deletions.
44 changes: 39 additions & 5 deletions .gitignore
@@ -1,5 +1,39 @@
.gradle
/local.properties
/.idea/workspace.xml
.DS_Store
/build
*.DS_Store
*.class
*.classpath
*.dex
*.eml
*.iml
*.project
*.swp
*.settings
.idea/
.gradle/
.metadata
/releases
bin/
gen/
build/
gradle/
local.properties

# crashlytics generated file
com_crashlytics_export_strings.xml

# fabric secret number
CollageProtoApp/fabric.properties

# HP version number
hpprint_ver.txt

# CMake and Makefile.
CMakeCache.txt
CMakeFiles
CMakeScripts
*.cmake
Makefile
install_manifest.txt
UnitTest

# Microsoft Visual Code
.vscode
87 changes: 0 additions & 87 deletions app/app.iml

This file was deleted.

16 changes: 8 additions & 8 deletions app/build.gradle
@@ -1,25 +1,25 @@
apply plugin: 'android'
apply plugin: "com.android.application"

android {
compileSdkVersion 20
buildToolsVersion "20.0.0"
compileSdkVersion 24
buildToolsVersion "24.0.3"

defaultConfig {
applicationId "com.whiterabbit.dragqueen"
minSdkVersion 17
targetSdkVersion 20
minSdkVersion 21
targetSdkVersion 24
versionCode 1
versionName "1.0"
}
buildTypes {
release {
runProguard false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
minifyEnabled false
proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
}
}
}

dependencies {
compile 'com.android.support:support-v4:20.+'
compile fileTree(dir: 'libs', include: ['*.jar'])
compile "com.android.support:support-v4:24.2.0"
}
2 changes: 1 addition & 1 deletion build.gradle
Expand Up @@ -5,7 +5,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:0.12.2'
classpath 'com.android.tools.build:gradle:2.2.3'

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand Down
6 changes: 0 additions & 6 deletions gradle/wrapper/gradle-wrapper.properties

This file was deleted.

0 comments on commit 727508b

Please sign in to comment.