Skip to content

Commit

Permalink
Upped SDK version
Browse files Browse the repository at this point in the history
  • Loading branch information
malexmave committed Apr 12, 2015
1 parent c83f12c commit d49cb7b
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 11 deletions.
8 changes: 4 additions & 4 deletions app/build.gradle
@@ -1,13 +1,13 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 20
buildToolsVersion "20.0.0"
compileSdkVersion 22
buildToolsVersion "22.0.1"

defaultConfig {
applicationId "tud.seemuh.nfcgate"
minSdkVersion 19
targetSdkVersion 20
targetSdkVersion 22
versionCode 1
versionName "1.0"
ndk {
Expand All @@ -29,5 +29,5 @@ dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
compile project(':nfcd')
compile files('libs/protobuf-java-2.6.1.jar')
compile 'com.android.support:support-v4:21.0.3'
compile 'com.android.support:support-v4:22.0.0'
}
2 changes: 1 addition & 1 deletion build.gradle
Expand Up @@ -5,7 +5,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:1.0.0-rc4'
classpath 'com.android.tools.build:gradle:1.1.0'

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand Down
14 changes: 8 additions & 6 deletions nfcd/build.gradle
@@ -1,12 +1,12 @@
apply plugin: 'com.android.library'

android {
compileSdkVersion 19
buildToolsVersion "19.1.0"
compileSdkVersion 22
buildToolsVersion "22.0.1"

defaultConfig {
minSdkVersion 19
targetSdkVersion 19
targetSdkVersion 22
versionCode 1
versionName "1.0"
ndk {
Expand All @@ -16,6 +16,11 @@ android {
abiFilters "armeabi"
}
}

sourceSets.main {
jniLibs.srcDir 'src/main/libs'
}

buildTypes {
release {
minifyEnabled false
Expand All @@ -24,9 +29,6 @@ android {
}
productFlavors {
}
sourceSets.main {
jniLibs.srcDir 'src/main/libs'
}
}

dependencies {
Expand Down

0 comments on commit d49cb7b

Please sign in to comment.