diff --git a/build.gradle b/build.gradle index 82697f55..0758e2f7 100644 --- a/build.gradle +++ b/build.gradle @@ -2,15 +2,15 @@ buildscript { repositories { + google() jcenter() maven { - url "https://jitpack.io" + url 'https://maven.fabric.io/public' } } dependencies { - classpath 'com.android.tools.build:gradle:2.3.0' - classpath 'com.github.dcendents:android-maven-plugin:1.2' - + classpath 'com.android.tools.build:gradle:3.3.1' + classpath 'io.fabric.tools:gradle:1.27.1' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files } @@ -22,5 +22,8 @@ allprojects { maven { url "https://jitpack.io" } + maven { + url "https://maven.google.com" // Google's Maven repository + } } } diff --git a/demo/build.gradle b/demo/build.gradle index 09dca2ba..64890470 100644 --- a/demo/build.gradle +++ b/demo/build.gradle @@ -6,7 +6,7 @@ repositories { android { compileSdkVersion Integer.parseInt(project.ANDROID_BUILD_SDK_VERSION) - buildToolsVersion project.ANDROID_BUILD_TOOLS_VERSION + //buildToolsVersion project.ANDROID_BUILD_TOOLS_VERSION defaultConfig { minSdkVersion Integer.parseInt(project.ANDROID_BUILD_MIN_SDK_VERSION) targetSdkVersion Integer.parseInt(project.ANDROID_BUILD_TARGET_SDK_VERSION) @@ -25,11 +25,13 @@ android { } dependencies { - compile project(":library") - compile 'com.android.support:recyclerview-v7:25.1.1' - compile 'com.daimajia.easing:library:1.0.0@aar' - compile 'com.daimajia.androidanimations:library:1.1.2@aar' - compile 'com.nineoldandroids:library:2.4.0' + implementation project(":library") + implementation 'com.android.support:appcompat-v7:27.1.1' + implementation 'com.android.support:recyclerview-v7:27.1.1' + + implementation 'com.daimajia.easing:library:1.0.0@aar' + implementation 'com.daimajia.androidanimations:library:1.1.2@aar' + implementation 'com.nineoldandroids:library:2.4.0' // This dude gave a shoutout to you (daimajia) on his github page: - compile 'jp.wasabeef:recyclerview-animators:1.0.3@aar' + implementation 'jp.wasabeef:recyclerview-animators:1.0.3@aar' } diff --git a/gradle.properties b/gradle.properties index beab8970..5a134334 100644 --- a/gradle.properties +++ b/gradle.properties @@ -18,11 +18,11 @@ # org.gradle.parallel=true -VERSION_NAME=1.2.0 -VERSION_CODE=22 +VERSION_NAME=1.2.1 +VERSION_CODE=23 GROUP=com.daimajia.swipelayout -ANDROID_BUILD_MIN_SDK_VERSION=9 -ANDROID_BUILD_TARGET_SDK_VERSION=25 -ANDROID_BUILD_SDK_VERSION=25 -ANDROID_BUILD_TOOLS_VERSION=25.0.2 +ANDROID_BUILD_MIN_SDK_VERSION=14 +ANDROID_BUILD_TARGET_SDK_VERSION=27 +ANDROID_BUILD_SDK_VERSION=27 + diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 776d2a5a..d8f78f0c 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Thu Mar 09 16:07:03 CST 2017 +#Wed Mar 06 15:07:26 NZDT 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip diff --git a/library/build.gradle b/library/build.gradle index 906272e1..9e90bf1a 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -2,17 +2,17 @@ apply plugin: 'com.android.library' android { compileSdkVersion Integer.parseInt(project.ANDROID_BUILD_SDK_VERSION) - buildToolsVersion project.ANDROID_BUILD_TOOLS_VERSION + //buildToolsVersion project.ANDROID_BUILD_TOOLS_VERSION defaultConfig { - minSdkVersion 9 + minSdkVersion 14 targetSdkVersion Integer.parseInt(project.ANDROID_BUILD_TARGET_SDK_VERSION) } } dependencies { - compile 'com.android.support:recyclerview-v7:25.2.0' - compile 'com.android.support:support-v4:25.2.0' + implementation 'com.android.support:appcompat-v7:27.1.1' + implementation 'com.android.support:recyclerview-v7:27.1.1' } apply from: './gradle-mvn-push.gradle' diff --git a/library/src/main/java/com/daimajia/swipe/adapters/RecyclerSwipeAdapter.java b/library/src/main/java/com/daimajia/swipe/adapters/RecyclerSwipeAdapter.java index f6e9aed3..c4f16697 100644 --- a/library/src/main/java/com/daimajia/swipe/adapters/RecyclerSwipeAdapter.java +++ b/library/src/main/java/com/daimajia/swipe/adapters/RecyclerSwipeAdapter.java @@ -1,8 +1,7 @@ package com.daimajia.swipe.adapters; -import android.support.v7.widget.RecyclerView; import android.view.ViewGroup; - +import android.support.v7.widget.RecyclerView; import com.daimajia.swipe.SwipeLayout; import com.daimajia.swipe.implments.SwipeItemMangerImpl; import com.daimajia.swipe.interfaces.SwipeAdapterInterface;