Skip to content

Commit

Permalink
Upgrade kotlin and appcompat
Browse files Browse the repository at this point in the history
  • Loading branch information
StephenVinouze committed Sep 6, 2017
1 parent eb8e208 commit 9f11427
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 12 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# AdvancedRecyclerView
[![Release](https://jitpack.io/v/StephenVinouze/AdvancedRecyclerView.svg)](https://jitpack.io/#StephenVinouze/AdvancedRecyclerView)
[![Build Status](https://travis-ci.org/StephenVinouze/AdvancedRecyclerView.svg)](https://travis-ci.org/StephenVinouze/AdvancedRecyclerView)
[![API](https://img.shields.io/badge/API-9%2B-brightgreen.svg?style=flat)](https://android-arsenal.com/api?level=9)
[![API](https://img.shields.io/badge/API-14%2B-brightgreen.svg?style=flat)](https://android-arsenal.com/api?level=14)
[![Android Arsenal](https://img.shields.io/badge/Android%20Arsenal-AdvancedRecyclerView-green.svg?style=true)](https://android-arsenal.com/details/1/3553)
[![GitHub
license](http://img.shields.io/badge/license-APACHE2-blue.svg)](https://github.com/StephenVinouze/AdvancedRecyclerView/blob/master/LICENSE)
Expand Down
4 changes: 3 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.

buildscript {
ext.kotlin_version = '1.1.4-2'
ext.kotlin_version = '1.1.4-3'
repositories {
jcenter()
maven { url 'https://maven.google.com' }
}
dependencies {
classpath 'com.android.tools.build:gradle:2.3.3'
Expand All @@ -15,6 +16,7 @@ buildscript {
allprojects {
repositories {
jcenter()
maven { url 'https://maven.google.com' }
}
}

Expand Down
2 changes: 1 addition & 1 deletion core/build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apply from: '../library.gradle'
apply plugin: 'kotlin-android'

def appcompat_version = "25.3.1"
def appcompat_version = "26.0.2"

dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
Expand Down
8 changes: 4 additions & 4 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true

VERSION_NAME=1.1.4
VERSION_NAME=1.1.5
VERSION_CODE=1
GROUP_ID=com.github.stephenvinouze
PACKAGING=aar

ANDROID_MIN_SDK_VERSION=9
ANDROID_BUILD_SDK_VERSION=25
ANDROID_BUILD_TOOLS_VERSION=25.0.3
ANDROID_MIN_SDK_VERSION=14
ANDROID_BUILD_SDK_VERSION=26
ANDROID_BUILD_TOOLS_VERSION=26.0.1

POM_NAME=AdvancedRecyclerView
POM_REPO=maven
Expand Down
10 changes: 5 additions & 5 deletions sample/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ plugins {
apply plugin: 'com.android.application'

android {
compileSdkVersion 25
buildToolsVersion "25.0.3"
compileSdkVersion Integer.parseInt(ANDROID_BUILD_SDK_VERSION)
buildToolsVersion ANDROID_BUILD_TOOLS_VERSION

defaultConfig {
applicationId "com.github.stephenvinouze.advancedrecyclerviewsample"
minSdkVersion 11
targetSdkVersion 25
minSdkVersion Integer.parseInt(ANDROID_MIN_SDK_VERSION)
targetSdkVersion Integer.parseInt(ANDROID_BUILD_SDK_VERSION)
versionCode 1
versionName "1.0"
}
Expand All @@ -30,7 +30,7 @@ android {
}
}

def appcompat_version = "25.3.1"
def appcompat_version = "26.0.2"

dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
Expand Down

0 comments on commit 9f11427

Please sign in to comment.