Skip to content

Commit

Permalink
Reviewed build.gradle files
Browse files Browse the repository at this point in the history
  • Loading branch information
davideas committed Nov 30, 2015
1 parent e056d02 commit 2a9b41a
Show file tree
Hide file tree
Showing 4 changed files with 54 additions and 37 deletions.
26 changes: 25 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
@@ -1,16 +1,40 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
ext {
//App
libraryCode = 10
libraryVersion = '2.1.0'

//Support and Build tools version
minSdk = 14
targetSdk = 23
buildTools = '23.0.2'
supportLibrary = '23.1.1'

//Support Libraries dependencies
supportDependencies = [
design : "com.android.support:design:${supportLibrary}",
recyclerview : "com.android.support:recyclerview-v7:${supportLibrary}",
cardview : "com.android.support:cardview-v7:${supportLibrary}",
appcompat : "com.android.support:appcompat-v7:${supportLibrary}",
customtabs : "com.android.support:customtabs:${supportLibrary}",
support : "com.android.support:support-v13:${supportLibrary}",
annotations : "com.android.support:support-annotations:${supportLibrary}",
palette : "com.android.support:palette-v7:${supportLibrary}"
]

}
buildscript {
repositories {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:1.2.3'
classpath 'com.android.tools.build:gradle:1.5.0'
}
}

allprojects {
repositories {
jcenter()
maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
}
}
33 changes: 15 additions & 18 deletions example/build.gradle
Original file line number Diff line number Diff line change
@@ -1,26 +1,23 @@
apply plugin: 'com.android.application'

repositories {
maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
}

android {
compileSdkVersion 23
buildToolsVersion "23.0.1"
compileSdkVersion targetSdk
buildToolsVersion buildTools

defaultConfig {
applicationId "com.r0adkll.slidr.example"
minSdkVersion 22
targetSdkVersion 23
versionCode 1
versionName "1.0"
minSdkVersion minSdk
targetSdkVersion targetSdk
versionCode libraryCode
versionName libraryVersion
}

buildTypes {
release {

}
}
buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}

lintOptions {
abortOnError false
Expand All @@ -32,9 +29,9 @@ dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
compile project(':library')

compile 'com.android.support:appcompat-v7:23.0.1'
compile 'com.android.support:recyclerview-v7:23.0.1'
compile 'com.android.support:cardview-v7:23.0.1'
compile supportDependencies.appcompat
compile supportDependencies.recyclerview
compile supportDependencies.cardview
compile 'com.jakewharton:butterknife:6.1.0'
compile 'com.github.bumptech.glide:glide:3.6.0'
compile 'com.r0adkll:deadskunk:1.0.4-SNAPSHOT'
Expand Down

This file was deleted.

19 changes: 14 additions & 5 deletions library/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,31 @@ apply plugin: 'com.android.library'
apply plugin: 'maven'

android {
compileSdkVersion 23
buildToolsVersion "23.0.1"
compileSdkVersion targetSdk
buildToolsVersion buildTools

defaultConfig {
minSdkVersion 14
targetSdkVersion 23
minSdkVersion minSdk
targetSdkVersion targetSdk
versionCode libraryCode
versionName libraryVersion
}

buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_7
targetCompatibility JavaVersion.VERSION_1_7
}
}

dependencies {
compile 'com.android.support:support-v4:23.0.1'
compile supportDependencies.support
}

apply from: '../gradle-mvn-push.gradle'
Expand Down

0 comments on commit 2a9b41a

Please sign in to comment.