From c574dced33924466ef2ac8f758944699ec89f364 Mon Sep 17 00:00:00 2001 From: dmorozov Date: Tue, 20 Sep 2022 14:12:34 +0300 Subject: [PATCH 1/2] Update project - Update gradle version - Fix gradle issues - Update mavenpush.gradle - Update compileSdkVersion - Update targetSdkVersion - Update buildToolsVersion - Migrate to AndroidX --- build.gradle | 5 +- gradle.properties | 4 ++ gradle/wrapper/gradle-wrapper.properties | 3 +- library/build.gradle | 13 +++-- .../yalantis/taurus/PullToRefreshView.java | 7 +-- .../java/com/yalantis/taurus/RefreshView.java | 3 +- mavenpush.gradle | 54 ++++++++++--------- sample/build.gradle | 13 ++--- sample/src/main/AndroidManifest.xml | 3 +- .../taurus/sample/PullToRefreshActivity.java | 5 +- 10 files changed, 62 insertions(+), 48 deletions(-) diff --git a/build.gradle b/build.gradle index d8315f0..90cf81c 100644 --- a/build.gradle +++ b/build.gradle @@ -1,10 +1,10 @@ buildscript { repositories { + google() mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:2.2.3' - classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5' + classpath 'com.android.tools.build:gradle:7.3.0' } } @@ -17,6 +17,7 @@ allprojects { group = GROUP repositories { + google() mavenCentral() } } diff --git a/gradle.properties b/gradle.properties index 55f6577..f7a3d8d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -17,6 +17,10 @@ # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects # org.gradle.parallel=true +android.useAndroidX=true +# Kotlin code style for this project: "official" or "obsolete": +kotlin.code.style=official + VERSION_NAME=1.0.0 VERSION_CODE=1 GROUP=com.yalantis diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 3d43824..41dfb87 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ -#Fri Jan 06 10:27:57 EET 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip diff --git a/library/build.gradle b/library/build.gradle index 5975abe..25d4eb3 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -1,22 +1,21 @@ -apply plugin: 'com.android.library' -apply plugin: 'com.github.dcendents.android-maven' +apply plugin: "com.android.library" group='com.yalantis' android { - compileSdkVersion 24 - buildToolsVersion "24.0.3" + compileSdkVersion 33 + buildToolsVersion "30.0.3" defaultConfig { minSdkVersion 11 - targetSdkVersion 24 + targetSdkVersion 33 versionCode 1 versionName "1.0" } } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - compile 'com.android.support:support-v4:24.1.1' + implementation fileTree(dir: 'libs', include: ['*.jar']) + implementation "androidx.appcompat:appcompat:1.5.1" } apply from: '../mavenpush.gradle' \ No newline at end of file diff --git a/library/src/main/java/com/yalantis/taurus/PullToRefreshView.java b/library/src/main/java/com/yalantis/taurus/PullToRefreshView.java index 82e06e2..9f4ab3b 100644 --- a/library/src/main/java/com/yalantis/taurus/PullToRefreshView.java +++ b/library/src/main/java/com/yalantis/taurus/PullToRefreshView.java @@ -1,9 +1,6 @@ package com.yalantis.taurus; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.v4.view.MotionEventCompat; -import android.support.v4.view.ViewCompat; import android.util.AttributeSet; import android.view.MotionEvent; import android.view.View; @@ -16,6 +13,10 @@ import android.widget.AbsListView; import android.widget.ImageView; +import androidx.annotation.NonNull; +import androidx.core.view.MotionEventCompat; +import androidx.core.view.ViewCompat; + public class PullToRefreshView extends ViewGroup { private static final int DRAG_MAX_DISTANCE = 120; diff --git a/library/src/main/java/com/yalantis/taurus/RefreshView.java b/library/src/main/java/com/yalantis/taurus/RefreshView.java index fd18f35..a568f39 100644 --- a/library/src/main/java/com/yalantis/taurus/RefreshView.java +++ b/library/src/main/java/com/yalantis/taurus/RefreshView.java @@ -11,12 +11,13 @@ import android.graphics.Rect; import android.graphics.drawable.Animatable; import android.graphics.drawable.Drawable; -import android.support.annotation.NonNull; import android.view.animation.AccelerateDecelerateInterpolator; import android.view.animation.Animation; import android.view.animation.Interpolator; import android.view.animation.Transformation; +import androidx.annotation.NonNull; + import java.util.HashMap; import java.util.Map; import java.util.Random; diff --git a/mavenpush.gradle b/mavenpush.gradle index b741e61..62396d5 100644 --- a/mavenpush.gradle +++ b/mavenpush.gradle @@ -1,4 +1,4 @@ -apply plugin: 'maven' +apply plugin: 'maven-publish' apply plugin: 'signing' def sonatypeRepositoryUrl @@ -21,51 +21,57 @@ def getRepositoryPassword() { } afterEvaluate { project -> - uploadArchives { - repositories { - mavenDeployer { - beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) } - - pom.artifactId = POM_ARTIFACT_ID + publishing { + publications { + mavenJava(MavenPublication) { - repository(url: sonatypeRepositoryUrl) { - authentication(userName: getRepositoryUsername(), password: getRepositoryPassword()) - } + artifactId = POM_ARTIFACT_ID - pom.project { - name POM_NAME - packaging POM_PACKAGING - description POM_DESCRIPTION - url POM_URL + pom { + name = POM_NAME + packaging = POM_PACKAGING + description = POM_DESCRIPTION + url = POM_URL scm { - url POM_SCM_URL - connection POM_SCM_CONNECTION - developerConnection POM_SCM_DEV_CONNECTION + url = POM_SCM_URL + connection = POM_SCM_CONNECTION + developerConnection = POM_SCM_DEV_CONNECTION } licenses { license { - name POM_LICENCE_NAME - url POM_LICENCE_URL - distribution POM_LICENCE_DIST + name = POM_LICENCE_NAME + url = POM_LICENCE_URL + distribution = POM_LICENCE_DIST } } developers { developer { - id POM_DEVELOPER_ID - name POM_DEVELOPER_NAME + id = POM_DEVELOPER_ID + name = POM_DEVELOPER_NAME } } } } } + + repositories { + maven { + url = sonatypeRepositoryUrl + + credentials { + username = getRepositoryUsername() + password = getRepositoryPassword() + } + } + } } signing { required { isReleaseBuild() && gradle.taskGraph.hasTask("uploadArchives") } - sign configurations.archives + sign publishing.publications.mavenJava } task androidJavadocs(type: Javadoc) { diff --git a/sample/build.gradle b/sample/build.gradle index a504069..4db3cbe 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -1,19 +1,20 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 24 - buildToolsVersion "24.0.3" + compileSdkVersion 33 + buildToolsVersion "30.0.3" defaultConfig { applicationId "com.yalantis.taurus.sample" - minSdkVersion 11 - targetSdkVersion 24 + minSdkVersion 14 + targetSdkVersion 33 versionCode 1 versionName "1.0" } } dependencies { - compile 'com.android.support:appcompat-v7:24.1.1' - compile project (':library') + implementation project (':library') + + implementation "androidx.appcompat:appcompat:1.5.1" } diff --git a/sample/src/main/AndroidManifest.xml b/sample/src/main/AndroidManifest.xml index 834c488..d618675 100644 --- a/sample/src/main/AndroidManifest.xml +++ b/sample/src/main/AndroidManifest.xml @@ -10,7 +10,8 @@ + android:screenOrientation="portrait" + android:exported="true"> diff --git a/sample/src/main/java/com/yalantis/taurus/sample/PullToRefreshActivity.java b/sample/src/main/java/com/yalantis/taurus/sample/PullToRefreshActivity.java index 26c426d..8038d1a 100644 --- a/sample/src/main/java/com/yalantis/taurus/sample/PullToRefreshActivity.java +++ b/sample/src/main/java/com/yalantis/taurus/sample/PullToRefreshActivity.java @@ -2,8 +2,6 @@ import android.content.Context; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.v7.app.AppCompatActivity; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -11,6 +9,9 @@ import android.widget.ListView; import android.widget.TextView; +import androidx.annotation.NonNull; +import androidx.appcompat.app.AppCompatActivity; + import com.yalantis.taurus.PullToRefreshView; import java.util.ArrayList; From d28fea7bfd0b8a599d3c6e04587ff02bcc522d03 Mon Sep 17 00:00:00 2001 From: dmorozov Date: Thu, 22 Sep 2022 12:59:33 +0300 Subject: [PATCH 2/2] Update library version - Update library version - Update README.md --- README.md | 13 +++++++++---- gradle.properties | 4 ++-- library/build.gradle | 4 ++-- sample/build.gradle | 4 ++-- 4 files changed, 15 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 0d59357..20e8c13 100644 --- a/README.md +++ b/README.md @@ -59,7 +59,7 @@ If you need to change progress state: ##Installing with [Gradle](http://gradle.org/) ```groovy -compile 'com.github.yalantis:taurus:1.0.2' +implementation 'com.github.yalantis:taurus:1.0.3' ``` #Compatibility @@ -68,13 +68,18 @@ compile 'com.github.yalantis:taurus:1.0.2' # Changelog -### Version: 1.0 +### Version: 1.0.3 + + * Updated depdendencies + * Migrated to AndroidX - * Initial Build - ### Version: 1.0.2 * Updated gradle version + +### Version: 1.0 + + * Initial Build #### Let us know! diff --git a/gradle.properties b/gradle.properties index f7a3d8d..9712376 100644 --- a/gradle.properties +++ b/gradle.properties @@ -21,8 +21,8 @@ android.useAndroidX=true # Kotlin code style for this project: "official" or "obsolete": kotlin.code.style=official -VERSION_NAME=1.0.0 -VERSION_CODE=1 +VERSION_NAME=1.0.3 +VERSION_CODE=2 GROUP=com.yalantis POM_DESCRIPTION=Android Library to add beautiful Pull-to-Refresh widget diff --git a/library/build.gradle b/library/build.gradle index 25d4eb3..dc760b3 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -8,8 +8,8 @@ android { defaultConfig { minSdkVersion 11 targetSdkVersion 33 - versionCode 1 - versionName "1.0" + versionCode 2 + versionName "1.0.3" } } diff --git a/sample/build.gradle b/sample/build.gradle index 4db3cbe..8aad84a 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -8,8 +8,8 @@ android { applicationId "com.yalantis.taurus.sample" minSdkVersion 14 targetSdkVersion 33 - versionCode 1 - versionName "1.0" + versionCode 2 + versionName "1.0.3" } }