Skip to content

Commit

Permalink
Updated libraries. Refactor code
Browse files Browse the repository at this point in the history
  • Loading branch information
Marco Hernaiz committed Apr 5, 2018
1 parent c92d964 commit b1be04e
Show file tree
Hide file tree
Showing 6 changed files with 208 additions and 245 deletions.
14 changes: 8 additions & 6 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,29 +3,31 @@ buildscript {
repositories {
jcenter()
mavenCentral()
google()
}

dependencies {
classpath 'com.android.tools.build:gradle:2.1.3'
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'
classpath 'com.android.tools.build:gradle:3.1.0'
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
}
}

allprojects {

ext {
androidApplicationId = 'com.marcohc.robotocalendar'
androidBuildToolsVersion = "24.0.1"
androidBuildToolsVersion = "27.0.3"
androidMinSdkVersion = 14
androidTargetSdkVersion = 24
androidCompileSdkVersion = 24
androidTargetSdkVersion = 27
androidCompileSdkVersion = 27
androidVersionCode = 1
androidVersionName = "3.1.1"
androidVersionName = "3.2.0"
}

repositories {
jcenter()
mavenCentral()
maven { url "https://jitpack.io" }
google()
}
}
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.5.1-all.zip
15 changes: 7 additions & 8 deletions library/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ apply plugin: 'com.github.dcendents.android-maven'
android {

def globalConfiguration = rootProject.extensions.getByName("ext")
compileSdkVersion globalConfiguration.getAt("androidCompileSdkVersion")
buildToolsVersion globalConfiguration.getAt("androidBuildToolsVersion")
compileSdkVersion globalConfiguration["androidCompileSdkVersion"]
buildToolsVersion globalConfiguration["androidBuildToolsVersion"]

defaultConfig {
minSdkVersion globalConfiguration.getAt("androidMinSdkVersion")
targetSdkVersion globalConfiguration.getAt("androidTargetSdkVersion")
versionCode globalConfiguration.getAt("androidVersionCode")
versionName globalConfiguration.getAt("androidVersionName")
minSdkVersion globalConfiguration["androidMinSdkVersion"]
targetSdkVersion globalConfiguration["androidTargetSdkVersion"]
versionCode globalConfiguration["androidVersionCode"]
versionName globalConfiguration["androidVersionName"]
vectorDrawables.useSupportLibrary = true
android.defaultConfig.vectorDrawables.useSupportLibrary = true
}
Expand All @@ -29,6 +29,5 @@ android {
}

dependencies {
compile 'uk.co.chrisjenx:calligraphy:2.2.0'
compile 'com.android.support:appcompat-v7:24.2.0'
implementation 'uk.co.chrisjenx:calligraphy:2.3.0'
}
Loading

0 comments on commit b1be04e

Please sign in to comment.