Skip to content

Commit

Permalink
Merge pull request #66 from rubensousa/develop
Browse files Browse the repository at this point in the history
2.2.1
  • Loading branch information
rubensousa authored May 27, 2020
2 parents f29d8c8 + 5664a6e commit b5a15b3
Show file tree
Hide file tree
Showing 12 changed files with 515 additions and 350 deletions.
34 changes: 34 additions & 0 deletions .github/workflows/dev.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
name: Dev

on:
pull_request:
paths-ignore:
- '**/*.md'
- '**/*.txt'
branches:
- 'develop'
push:
paths-ignore:
- '**/*.md'
- '**/*.txt'
branches:
- 'develop'

jobs:
build:

runs-on: ubuntu-latest

steps:
- name: checkout
uses: actions/checkout@v2
- name: setup JDK 1.8
uses: actions/setup-java@v1
with:
java-version: 1.8
- name: Install Android SDK
uses: malinskiy/action-android/install-sdk@release/0.0.5
- name: Run unit tests
run: ./gradlew testDebugUnitTest --stacktrace -Pbintray_user=${{ secrets.BINTRAY_USER }} -Pbintray_apikey=${{ secrets.BINTRAY_KEY }}
- name: Assemble library
run: ./gradlew assembleRelease -Pbintray_user=${{ secrets.BINTRAY_USER }} -Pbintray_apikey=${{ secrets.BINTRAY_KEY }}
30 changes: 30 additions & 0 deletions .github/workflows/master.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
name: Release

on:
push:
paths-ignore:
- '**/*.md'
- '**/*.txt'
branches:
- 'master'

jobs:
build:

runs-on: ubuntu-latest

steps:
- name: checkout
uses: actions/checkout@v2
- name: setup JDK 1.8
uses: actions/setup-java@v1
with:
java-version: 1.8
- name: Install Android SDK
uses: malinskiy/action-android/install-sdk@release/0.0.5
- name: Run unit tests
run: ./gradlew testDebugUnitTest --stacktrace -Pbintray_user=${{ secrets.BINTRAY_USER }} -Pbintray_apikey=${{ secrets.BINTRAY_KEY }}
- name: Assemble library
run: ./gradlew assembleRelease -Pbintray_user=${{ secrets.BINTRAY_USER }} -Pbintray_apikey=${{ secrets.BINTRAY_KEY }}
- name: Release library
run: ./gradlew bintrayUpload -Pbintray_user=${{ secrets.BINTRAY_USER }} -Pbintray_apikey=${{ secrets.BINTRAY_KEY }}
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog

## 2.2.1

- Fixed `GravitySnapHelper` not dispatching snap events for edge items sometimes on `SnapListener`

## 2.2.0

### New features
Expand Down
11 changes: 8 additions & 3 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,19 @@ android {
sourceCompatibility 1.8
targetCompatibility 1.8
}

kotlinOptions {
jvmTarget = "1.8"
}

}

dependencies {
implementation 'androidx.core:core-ktx:1.0.2'
implementation 'androidx.core:core-ktx:1.2.0'
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation project(':gravitysnaphelper')
implementation 'com.google.android.material:material:1.1.0-alpha09'
implementation 'androidx.appcompat:appcompat:1.0.2'
implementation 'com.google.android.material:material:1.1.0'
implementation 'androidx.appcompat:appcompat:1.1.0'
implementation 'androidx.cardview:cardview:1.0.0'
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
}
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
buildscript {
ext.kotlin_version = '1.3.50'
ext.kotlin_version = '1.3.72'
repositories {
google()
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.5.0'
classpath 'com.android.tools.build:gradle:3.6.3'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
}
Expand All @@ -19,7 +19,7 @@ allprojects {
}

ext {
compileSdkVersion = 28
compileSdkVersion = 29
targetSdkVersion = compileSdkVersion
minSdkVersion = 14
}
15 changes: 8 additions & 7 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,17 @@
# This option should only be used with decoupled projects. More details, visit
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true
GROUP=com.github.rubensousa
VERSION_NAME=2.2.0
POM_ARTIFACT_ID=gravitysnaphelper
LIBRARY_GROUP=com.github.rubensousa
LIBRARY_VERSION=2.2.1
LIBRARY_ARTIFACT=gravitysnaphelper
POM_NAME=GravitySnapHelper
POM_DESCRIPTION=A SnapHelper that snaps the RecyclerView to an edge
POM_PACKAGING=aar
POM_URL=https://github.com/rubensousa/RecyclerViewSnap
POM_SCM_URL=https://github.com/rubensousa/RecyclerViewSnap
POM_SCM_CONNECTION=scm:git:git://github.com/rubensousa/RecyclerViewSnap.git
POM_SCM_DEV_CONNECTION=scm:git:ssh://[email protected]/rubensousa/RecyclerViewSnap.git
POM_URL=https://github.com/rubensousa/GravitySnapHelper
POM_SCM_URL=https://github.com/rubensousa/GravitySnapHelper
POM_VCS_URL=https://github.com/rubensousa/GravitySnapHelper.git
POM_SCM_CONNECTION=scm:git:git://github.com/rubensousa/GravitySnapHelper.git
POM_SCM_DEV_CONNECTION=scm:git:ssh://[email protected]/rubensousa/GravitySnapHelper.git
POM_LICENCE_NAME=The Apache Software License, Version 2.0
POM_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt
POM_LICENCE_DIST=repo
Expand Down
19 changes: 0 additions & 19 deletions gradle/gradle-bintray-upload.gradle

This file was deleted.

218 changes: 0 additions & 218 deletions gradle/gradle-mvn-push.gradle

This file was deleted.

Loading

0 comments on commit b5a15b3

Please sign in to comment.