Skip to content

Commit d237914

Browse files
author
rygelouv
committed
Removed unnecessary kotlin dependencies, updated to latest support dependencies and build tools
1 parent 9c98fb2 commit d237914

File tree

5 files changed

+24
-21
lines changed

5 files changed

+24
-21
lines changed

README.md

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ and:
3232

3333
```gradle
3434
dependencies {
35-
compile 'com.github.Rygelouv:Android-LoadingButton:1.1.1'
35+
compile 'com.github.Rygelouv:Android-LoadingButton:1.2.0'
3636
}
3737
```
3838

@@ -67,15 +67,13 @@ You have two method that let you start stop the loading state of the button, for
6767
Using `startLoading()`
6868

6969
```java
70-
((LoadingButton)findViewById(R.id.button_test))
71-
.startLoading("Loading...");
70+
((LoadingButton)findViewById(R.id.button_test)).startLoading("Loading...");
7271
```
7372

7473
Or `stopLoading`
7574

76-
```
77-
((LoadingButton)findViewById(R.id.button_test))
78-
.stopLoading("Done!");
75+
```java
76+
((LoadingButton)findViewById(R.id.button_test)).stopLoading("Done!");
7977
```
8078

8179
# Credits

androidloadingbuttonlib/src/main/java/com/github/rygelouv/androidloadingbuttonlib/LoadingButton.java

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,19 @@
1717
* Created by rygelouv on 9/21/17.
1818
* <p>
1919
* AndroidLoadingButton
20-
* Copyright (c) 2017 Rygel Louv All rights reserved.
20+
* Copyright 2017 Rygelouv.
21+
22+
Licensed under the Apache License, Version 2.0 (the "License");
23+
you may not use this file except in compliance with the License.
24+
You may obtain a copy of the License at
25+
26+
http://www.apache.org/licenses/LICENSE-2.0
27+
28+
Unless required by applicable law or agreed to in writing, software
29+
distributed under the License is distributed on an "AS IS" BASIS,
30+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
31+
See the License for the specific language governing permissions and
32+
limitations under the License.
2133
*/
2234

2335
public class LoadingButton extends LinearLayout

app/build.gradle

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,12 @@
11
apply plugin: 'com.android.application'
22

3-
apply plugin: 'kotlin-android'
4-
5-
apply plugin: 'kotlin-android-extensions'
63

74
android {
8-
compileSdkVersion 26
9-
buildToolsVersion "26.0.1"
5+
compileSdkVersion 27
106
defaultConfig {
117
applicationId "com.github.rygelouv.androidloadingbutton"
128
minSdkVersion 16
13-
targetSdkVersion 26
9+
targetSdkVersion 27
1410
versionCode 1
1511
versionName "1.0"
1612
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -25,12 +21,11 @@ android {
2521

2622
dependencies {
2723
implementation fileTree(include: ['*.jar'], dir: 'libs')
28-
implementation 'com.android.support:appcompat-v7:26.1.0'
29-
implementation 'com.android.support.constraint:constraint-layout:1.0.2'
24+
implementation 'com.android.support:appcompat-v7:27.1.1'
25+
implementation 'com.android.support.constraint:constraint-layout:1.1.0'
3026
testImplementation 'junit:junit:4.12'
3127
androidTestImplementation('com.android.support.test.espresso:espresso-core:3.0.1', {
3228
exclude group: 'com.android.support', module: 'support-annotations'
3329
})
34-
implementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
3530
implementation project(':androidloadingbuttonlib')
3631
}

build.gradle

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
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.1.4-3'
54
repositories {
65
google()
76
jcenter()
87
}
98
dependencies {
10-
classpath 'com.android.tools.build:gradle:3.0.0-beta6'
11-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
9+
classpath 'com.android.tools.build:gradle:3.1.1'
1210
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
1311

1412
// NOTE: Do not place your application dependencies here; they belong
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Thu Sep 21 12:24:48 GMT 2017
1+
#Wed Apr 18 12:55:47 GMT 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.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip

0 commit comments

Comments
 (0)