Skip to content

Commit

Permalink
Merge pull request #2 from lhoyong/dev
Browse files Browse the repository at this point in the history
update gradle
  • Loading branch information
lhoyong authored Apr 5, 2018
2 parents 0e16427 + d5489c0 commit a11c8cd
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 36 deletions.
12 changes: 10 additions & 2 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ apply plugin: 'kotlin-android'
apply plugin: 'kotlin-android-extensions'

android {
compileSdkVersion 26
compileSdkVersion rootProject.ext.compileSdkVersion

defaultConfig {
applicationId "com.github.lhoyong.transparencyseekbar"
minSdkVersion 19
Expand All @@ -30,5 +31,12 @@ dependencies {
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'

implementation fileTree(include: ['*.jar'], dir: 'libs')
implementation project(':lib')
compile project(':lib')
}

buildscript {
repositories {
jcenter()
maven { url "https://jitpack.io" }
}
}
11 changes: 5 additions & 6 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.

buildscript {
ext.kotlin_version = '1.2.31'
ext.kotlin_version = '1.2.30'
repositories {
google()
Expand All @@ -10,11 +7,13 @@ buildscript {
dependencies {
classpath 'com.android.tools.build:gradle:3.0.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
}
}
ext {
compileSdkVersion = 26
buildToolsVersion = '26.0.1'
}

allprojects {
repositories {
Expand Down
34 changes: 6 additions & 28 deletions lib/build.gradle
Original file line number Diff line number Diff line change
@@ -1,38 +1,16 @@
apply plugin: 'com.android.library'
apply plugin: 'kotlin-android'
apply plugin: 'kotlin-android-extensions'

android {
compileSdkVersion 26



defaultConfig {
minSdkVersion 19
targetSdkVersion 26
versionCode 1
versionName "1.0"

testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"

}
apply plugin: 'com.android.library'
apply plugin: 'com.github.dcendents.android-maven'

buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
group = 'com.github.lhoyong'
version = '0.0.1'

android {
compileSdkVersion rootProject.ext.compileSdkVersion
}

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

implementation 'com.android.support:appcompat-v7:26.1.0'
testImplementation 'junit:junit:4.12'
androidTestImplementation 'com.android.support.test:runner:1.0.1'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
compile "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
}
repositories {
Expand Down

0 comments on commit a11c8cd

Please sign in to comment.