Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update project #12

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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!
Expand Down
5 changes: 3 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -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'
}
}

Expand All @@ -17,6 +17,7 @@ allprojects {
group = GROUP

repositories {
google()
mavenCentral()
}
}
Expand Down
8 changes: 6 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,12 @@
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true

VERSION_NAME=1.0.0
VERSION_CODE=1
android.useAndroidX=true
# Kotlin code style for this project: "official" or "obsolete":
kotlin.code.style=official

VERSION_NAME=1.0.3
VERSION_CODE=2
GROUP=com.yalantis

POM_DESCRIPTION=Android Library to add beautiful Pull-to-Refresh widget
Expand Down
3 changes: 1 addition & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
17 changes: 8 additions & 9 deletions library/build.gradle
Original file line number Diff line number Diff line change
@@ -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
versionCode 1
versionName "1.0"
targetSdkVersion 33
versionCode 2
versionName "1.0.3"
}
}

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'
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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;
Expand Down
3 changes: 2 additions & 1 deletion library/src/main/java/com/yalantis/taurus/RefreshView.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
54 changes: 30 additions & 24 deletions mavenpush.gradle
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apply plugin: 'maven'
apply plugin: 'maven-publish'
apply plugin: 'signing'

def sonatypeRepositoryUrl
Expand All @@ -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) {
Expand Down
17 changes: 9 additions & 8 deletions sample/build.gradle
Original file line number Diff line number Diff line change
@@ -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
versionCode 1
versionName "1.0"
minSdkVersion 14
targetSdkVersion 33
versionCode 2
versionName "1.0.3"
}
}

dependencies {
compile 'com.android.support:appcompat-v7:24.1.1'
compile project (':library')
implementation project (':library')

implementation "androidx.appcompat:appcompat:1.5.1"
}
3 changes: 2 additions & 1 deletion sample/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
<activity
android:name="com.yalantis.taurus.sample.PullToRefreshActivity"
android:label="@string/app_name"
android:screenOrientation="portrait">
android:screenOrientation="portrait"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,16 @@

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;
import android.widget.ArrayAdapter;
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;
Expand Down