Merge pull request #27 from zTrap/patch-3

Update build.gradle
mancj · May 30, 2017 · 6ffb605 · 6ffb605
2 parents cce747e + 9e51fec
commit 6ffb605
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 43 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/README.md b/README.md
@@ -4,10 +4,8 @@ SlideUp is a small library that allows you to add sweet slide effect to any view
 [![Release](https://jitpack.io/v/mancj/SlideUp-Android.svg)](https://jitpack.io/#mancj/SlideUp-Android)
 ---
 
-<img src="https://github.com/mancj/mancj.github.io/blob/master/other/slideup-art/art1.gif" width="300">
-<img src="https://github.com/mancj/mancj.github.io/blob/master/other/slideup-art/art2.gif" width="300">
-
----
+<img src="https://github.com/mancj/mancj.github.io/blob/master/other/slideup-art/art1.gif" width="300"> <img src="https://github.com/mancj/mancj.github.io/blob/master/other/slideup-art/art2.gif" width="302">
+-----
 # Usage
 **Get SlideUp library**
 
@@ -24,7 +22,7 @@ allprojects {
 Add the dependency
 ```groovy
 dependencies {
-    compile 'com.github.mancj:SlideUp-Android:2.2.4'
+    compile 'com.github.mancj:SlideUp-Android:2.2.5'
 }
 ```
 
@@ -55,7 +53,6 @@ slideUp = new SlideUp.Builder(slideView)
                 .build();
 ```
 ## Enjoy!
----
 # More complicated example
 
 ```java

diff --git a/app/build.gradle b/app/build.gradle
@@ -1,14 +1,8 @@
 apply plugin: 'com.android.application'
 
 android {
-
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-
     compileSdkVersion 25
-    buildToolsVersion "25.0.3"
+    buildToolsVersion '25.0.3'
     defaultConfig {
         applicationId "com.example.slideup"
         minSdkVersion 12
@@ -24,6 +18,9 @@ android {
         }
     }
 
+    lintOptions {
+        abortOnError false
+    }
 }
 
 dependencies {

diff --git a/app/src/main/java/com/example/slideup/SlideDownViewActivity.java b/app/src/main/java/com/example/slideup/SlideDownViewActivity.java
@@ -30,7 +30,7 @@ protected void onCreate(Bundle savedInstanceState) {
         fab = (FloatingActionButton) findViewById(R.id.fab);
 
         slideUp = new SlideUp.Builder(sliderView)
-                .withListeners(new SlideUp.Listener() {
+                .withListeners(new SlideUp.Listener.Events() {
                     @Override
                     public void onSlide(float percent) {
                         dim.setAlpha(1 - (percent / 100));

diff --git a/app/src/main/java/com/example/slideup/SlideEndViewActivity.java b/app/src/main/java/com/example/slideup/SlideEndViewActivity.java
@@ -30,7 +30,7 @@ protected void onCreate(Bundle savedInstanceState) {
         fab = (FloatingActionButton) findViewById(R.id.fab);
 
         slideUp = new SlideUp.Builder(sliderView)
-                .withListeners(new SlideUp.Listener() {
+                .withListeners(new SlideUp.Listener.Events() {
                     @Override
                     public void onSlide(float percent) {
                         dim.setAlpha(1 - (percent / 100));

diff --git a/app/src/main/java/com/example/slideup/SlideStartViewActivity.java b/app/src/main/java/com/example/slideup/SlideStartViewActivity.java
@@ -30,7 +30,7 @@ protected void onCreate(Bundle savedInstanceState) {
         fab = (FloatingActionButton) findViewById(R.id.fab);
 
         slideUp = new SlideUp.Builder(sliderView)
-                .withListeners(new SlideUp.Listener() {
+                .withListeners(new SlideUp.Listener.Events() {
                     @Override
                     public void onSlide(float percent) {
                         dim.setAlpha(1 - (percent / 100));

diff --git a/app/src/main/java/com/example/slideup/SlideUpViewActivity.java b/app/src/main/java/com/example/slideup/SlideUpViewActivity.java
@@ -30,7 +30,7 @@ protected void onCreate(Bundle savedInstanceState) {
         fab = (FloatingActionButton) findViewById(R.id.fab);
 
         slideUp = new SlideUp.Builder(sliderView)
-                .withListeners(new SlideUp.Listener() {
+                .withListeners(new SlideUp.Listener.Events() {
                     @Override
                     public void onSlide(float percent) {
                         dim.setAlpha(1 - (percent / 100));

diff --git a/build.gradle b/build.gradle
@@ -12,7 +12,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.0-alpha2'
+        classpath 'com.android.tools.build:gradle:2.3.2'
     }
 }
 

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue May 30 11:03:09 MSK 2017
+#Tue May 30 17:07:46 MSK 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-milestone-1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
diff --git a/library/build.gradle b/library/build.gradle
@@ -1,29 +1,25 @@
 apply plugin: 'com.android.library'
 
 android {
-
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-
     compileSdkVersion 25
-    buildToolsVersion "25.0.3"
+    buildToolsVersion '25.0.3'
 
     defaultConfig {
         minSdkVersion 12
         targetSdkVersion 25
-        versionCode 6
-        versionName "2.2.4"
+        versionCode 7
+        versionName "2.2.5"
     }
     buildTypes {
         release {
             minifyEnabled false
         }
     }
+
     lintOptions {
         abortOnError false
     }
+
     tasks.withType(Javadoc) {
         options.addStringOption('Xdoclint:none', '-quiet')
         options.addStringOption('encoding', 'UTF-8')
@@ -34,6 +30,7 @@ dependencies {
     compile "com.android.support:support-annotations:${versions.support}"
     compile "com.android.support:appcompat-v7:${versions.support}"
 }
+
 task androidJavadocs(type: Javadoc) {
     source = android.sourceSets.main.java.srcDirs
     classpath += project.files(android.getBootClasspath().join(File.pathSeparator))