Skip to content

Commit

Permalink
Update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
neworld committed Nov 17, 2018
1 parent 4e31c64 commit 4672b7e
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 12 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@
/build
/captures
.externalNativeBuild
.gradletasknamecache
7 changes: 6 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
### 1.0.0

- Add `span(startIndex, searchText, spans)` method
- Update dependencies

### 0.5.0

- Add image from resource id support
Expand Down Expand Up @@ -28,4 +33,4 @@

- New span support: `click`, `url`, `custom`
- Function to apply spans on existing text: `span()`
- Fixed replace in multiple occurrences text
- Fixed replace in multiple occurrences text
11 changes: 5 additions & 6 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,19 +1,18 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.

buildscript {
ext.KOTLIN_VERSION = '1.2.30'
ext.COMPILE_SDK_VERSION = 27
ext.BUILD_TOOLS_VERSION = "27.0.3"
ext.KOTLIN_VERSION = '1.2.71'
ext.COMPILE_SDK_VERSION = 28
ext.MIN_SDK_VERSION = 14
ext.TARGET_SDK_VERSION = 27
ext.SUPPORT_LIB_VERSION = "27.1.0"
ext.TARGET_SDK_VERSION = 28
ext.SUPPORT_LIB_VERSION = "28.0.0"

repositories {
jcenter()
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.0.1'
classpath 'com.android.tools.build:gradle:3.2.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$KOTLIN_VERSION"

// NOTE: Do not place your application dependencies here; they belong
Expand Down
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-4.6-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip
3 changes: 1 addition & 2 deletions lib/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ apply plugin: 'kotlin-android'

android {
compileSdkVersion COMPILE_SDK_VERSION
buildToolsVersion BUILD_TOOLS_VERSION

defaultConfig {
minSdkVersion MIN_SDK_VERSION
Expand All @@ -30,7 +29,7 @@ dependencies {
exclude group: 'com.android.support', module: 'support-annotations'
})
testImplementation 'junit:junit:4.12'
testImplementation "org.robolectric:robolectric:3.5.1"
testImplementation "org.robolectric:robolectric:4.0.2"
testImplementation "org.jetbrains.kotlin:kotlin-reflect:$KOTLIN_VERSION"
compileOnly "org.jetbrains.kotlin:kotlin-runtime:$KOTLIN_VERSION"
}
Expand Down
3 changes: 1 addition & 2 deletions sample/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ apply plugin: 'kotlin-android'

android {
compileSdkVersion COMPILE_SDK_VERSION
buildToolsVersion BUILD_TOOLS_VERSION
defaultConfig {
applicationId "lt.neworld.spanner.sample"
minSdkVersion MIN_SDK_VERSION
Expand All @@ -14,4 +13,4 @@ android {
dependencies {
implementation project(":lib")
implementation "com.android.support:appcompat-v7:$SUPPORT_LIB_VERSION"
}
}

0 comments on commit 4672b7e

Please sign in to comment.