Skip to content

Commit 7e71fd0

Browse files
committed
Update libs 1.5
1 parent e7b2b37 commit 7e71fd0

File tree

11 files changed

+110
-182
lines changed

11 files changed

+110
-182
lines changed

.idea/compiler.xml

Lines changed: 0 additions & 22 deletions
This file was deleted.

.idea/copyright/profiles_settings.xml

Lines changed: 0 additions & 3 deletions
This file was deleted.

.idea/inspectionProfiles/Project_Default.xml

Lines changed: 0 additions & 11 deletions
This file was deleted.

.idea/inspectionProfiles/profiles_settings.xml

Lines changed: 0 additions & 7 deletions
This file was deleted.

.idea/markdown-navigator/profiles_settings.xml

Lines changed: 0 additions & 3 deletions
This file was deleted.

.idea/misc.xml

Lines changed: 74 additions & 20 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/build.gradle

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
apply plugin: 'com.android.application'
22
apply plugin: 'kotlin-android'
3-
apply from: "$rootDir/jacoco.gradle"
3+
//apply from: "$rootDir/jacoco.gradle"
44

55
android {
6-
compileSdkVersion 25
7-
buildToolsVersion "25.0.3"
6+
compileSdkVersion 27
7+
buildToolsVersion "27.0.3"
88
defaultConfig {
99
applicationId "ru.whalemare.bottomsheet"
1010
minSdkVersion 16
11-
targetSdkVersion 25
11+
targetSdkVersion 27
1212
versionCode 1
1313
versionName app_version
1414
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -24,23 +24,15 @@ android {
2424
sourceCompatibility JavaVersion.VERSION_1_7
2525
targetCompatibility JavaVersion.VERSION_1_7
2626
}
27-
// productFlavors {
28-
// dev {
29-
// applicationIdSuffix ".dev"
30-
// }
31-
// uat {
32-
// applicationIdSuffix ".uat"
33-
// }
34-
// }
3527
}
3628

3729
dependencies {
38-
compile fileTree(dir: 'libs', include: ['*.jar'])
39-
compile project(path: ':sheetmenu')
40-
// compile 'com.github.whalemare:sheetmenu:1.3.2'
41-
compile 'com.android.support:appcompat-v7:25.3.1'
42-
compile 'com.android.support.constraint:constraint-layout:1.0.2'
43-
compile "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
30+
implementation fileTree(dir: 'libs', include: ['*.jar'])
31+
implementation project(path: ':sheetmenu')
32+
// implementation 'com.github.whalemare:sheetmenu:1.3.5'
33+
implementation "com.android.support:appcompat-v7:$supportVersion"
34+
implementation "com.android.support.constraint:constraint-layout:1.1.0"
35+
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
4436

4537
testCompile 'junit:junit:4.12'
4638
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {

build.gradle

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22

33
buildscript {
4-
ext.kotlin_version = '1.2.21'
5-
ext.app_version = "1.3.4"
4+
ext.kotlin_version = '1.2.41'
5+
ext.app_version = "1.3.5"
6+
ext.supportVersion = "27.1.1"
67
repositories {
78
jcenter()
9+
google()
810
}
911
dependencies {
10-
classpath 'com.android.tools.build:gradle:2.3.2'
12+
classpath 'com.android.tools.build:gradle:3.1.2'
1113
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
12-
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
13-
classpath 'com.dicedmelon.gradle:jacoco-android:0.1.1'
14+
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
1415
// NOTE: Do not place your application dependencies here; they belong
1516
// in the individual module build.gradle files
1617
}
@@ -20,13 +21,16 @@ allprojects {
2021
repositories {
2122
jcenter()
2223
maven { url 'https://jitpack.io' }
24+
maven {
25+
url 'https://maven.google.com'
26+
}
2327
}
2428
}
2529

2630
task clean(type: Delete) {
2731
delete rootProject.buildDir
2832
}
2933

30-
task getHomeDir << {
31-
println gradle.gradleHomeDir
32-
}
34+
//task getHomeDir << {
35+
// println gradle.gradleHomeDir
36+
//}
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Sun Jun 18 20:34:21 NOVT 2017
1+
#Fri May 04 18:56:38 NOVT 2018
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip

jacoco.gradle

Lines changed: 0 additions & 76 deletions
This file was deleted.

0 commit comments

Comments
 (0)