Skip to content

Commit

Permalink
Update gradle
Browse files Browse the repository at this point in the history
  • Loading branch information
divyanshub024 committed Sep 11, 2018
1 parent c87d7dc commit 2475d8c
Show file tree
Hide file tree
Showing 10 changed files with 58 additions and 106 deletions.
25 changes: 25 additions & 0 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 7 additions & 9 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,13 @@ apply plugin: 'kotlin-android'
apply plugin: 'kotlin-android-extensions'

android {
compileSdkVersion 28
buildToolsVersion "28.0.1"
compileSdkVersion rootProject.ext.compileSdkVersion
buildToolsVersion rootProject.ext.buildToolsVersion

defaultConfig {
applicationId "com.divyanshu.colorseekbardemo"
minSdkVersion 14
targetSdkVersion 28
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
versionName "1.0"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
Expand All @@ -26,10 +27,7 @@ android {
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation 'androidx.appcompat:appcompat:1.0.0-beta01'
implementation 'androidx.constraintlayout:constraintlayout:1.1.2'
testImplementation 'junit:junit:4.12'
androidTestImplementation 'androidx.test:runner:1.1.0-alpha4'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0-alpha4'
implementation "androidx.appcompat:appcompat:$rootProject.ext.supportLibraryVersion"
implementation "androidx.constraintlayout:constraintlayout:$rootProject.ext.constraintlayout"
implementation project(path: ':colorseekbar')
}

This file was deleted.

This file was deleted.

1 change: 1 addition & 0 deletions bintray/properties.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
bintray.properties
17 changes: 14 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.

buildscript {
ext.kotlin_version = '1.2.60'
ext.kotlin_version = '1.2.50'
ext.kotlin_version = '1.2.61'
repositories {
google()
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.3.0-alpha06'
classpath 'com.android.tools.build:gradle:3.3.0-alpha08'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
Expand All @@ -30,4 +29,16 @@ allprojects {

task clean(type: Delete) {
delete rootProject.buildDir
}

ext {
// Sdk and tools
minSdkVersion = 14
targetSdkVersion = 28
compileSdkVersion = 28
buildToolsVersion = '28.0.2'

// App dependencies
supportLibraryVersion = '1.0.0-rc02'
constraintlayout = '1.1.3'
}
14 changes: 5 additions & 9 deletions colorseekbar/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,12 @@ ext {
}

android {
compileSdkVersion 28
buildToolsVersion "28.0.1"

compileSdkVersion rootProject.ext.compileSdkVersion
buildToolsVersion rootProject.ext.buildToolsVersion

defaultConfig {
minSdkVersion 14
targetSdkVersion 28
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
versionName "1.0"

Expand All @@ -52,10 +51,7 @@ android {
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])

implementation 'androidx.appcompat:appcompat:1.0.0-beta01'
testImplementation 'junit:junit:4.12'
androidTestImplementation 'androidx.test:runner:1.1.0-alpha4'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0-alpha4'
implementation "androidx.appcompat:appcompat:$rootProject.ext.supportLibraryVersion"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
}
repositories {
Expand Down

This file was deleted.

This file was deleted.

0 comments on commit 2475d8c

Please sign in to comment.