Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
dmdevgo committed Feb 7, 2021
2 parents 073454e + aed1e49 commit d392ccf
Show file tree
Hide file tree
Showing 60 changed files with 1,610 additions and 215 deletions.
8 changes: 4 additions & 4 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
MIT License
The MIT License (MIT)

Copyright (c) 2017 Dmitriy Gorbunov (dmitriy.goto@gmail.com)
and Vasili Chyrvon (vasili.chyrvon@gmail.com)
Copyright (c) 2017-2021 Dmitriy Gorbunov (dmitriy.goto@gmail.com)
and Vasili Chyrvon (vasili.chyrvon@gmail.com)

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand All @@ -19,4 +19,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
SOFTWARE.
7 changes: 3 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -325,11 +325,10 @@ Note that Command passes events only when PM is in the RESUMED state.
## License

```
The MIT License (MIT)
MIT License
Copyright (c) 2017 Dmitriy Gorbunov (dmitriy.goto@gmail.com)
and Vasili Chyrvon (vasili.chyrvon@gmail.com)
Copyright (c) 2017-2021 Dmitriy Gorbunov (dmitriy.goto@gmail.com)
and Vasili Chyrvon (vasili.chyrvon@gmail.com)
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
20 changes: 11 additions & 9 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,18 +1,20 @@
buildscript {
ext.kotlinVersion = '1.3.72'
ext.kotlinVersion = '1.4.30'
repositories {
google()
mavenCentral()
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:4.0.1'
classpath 'com.android.tools.build:gradle:4.1.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
}
}

allprojects {
repositories {
google()
mavenCentral()
jcenter()
}
}
Expand All @@ -24,24 +26,24 @@ task clean(type: Delete) {
ext {

minSdkVersion = 16
compileSdkVersion = 29
targetSdkVersion = 29
compileSdkVersion = 30
targetSdkVersion = 30
rxBindingVersion = '3.1.0'

annotation = 'androidx.annotation:annotation:1.2.0-alpha01'
appCompat = 'androidx.appcompat:appcompat:1.3.0-alpha01'
materialDesign = 'com.google.android.material:material:1.3.0-alpha01'
annotation = 'androidx.annotation:annotation:1.2.0-beta01'
appCompat = 'androidx.appcompat:appcompat:1.3.0-beta01'
materialDesign = 'com.google.android.material:material:1.3.0'

kotlinStdlib = "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"

rxJava2 = "io.reactivex.rxjava2:rxjava:2.2.19"
rxJava2 = "io.reactivex.rxjava2:rxjava:2.2.20"
rxRelay2 = "com.jakewharton.rxrelay2:rxrelay:2.1.1"
rxAndroid2 = "io.reactivex.rxjava2:rxandroid:2.1.1"

rxBinding = "com.jakewharton.rxbinding3:rxbinding:$rxBindingVersion"
rxBindingAppCompat = "com.jakewharton.rxbinding3:rxbinding-appcompat:$rxBindingVersion"

conductor = "com.bluelinelabs:conductor:3.0.0-rc5"
conductor = "com.bluelinelabs:conductor:3.0.1"

junitKotlin = "org.jetbrains.kotlin:kotlin-test-junit:$kotlinVersion"
mockitoKotlin = 'com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0'
Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Sat Jul 18 00:41:11 MSK 2020
#Sun Feb 07 20:50:34 MSK 2021
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
16 changes: 0 additions & 16 deletions rxpm/androidmaven.gradle

This file was deleted.

25 changes: 0 additions & 25 deletions rxpm/bintray.gradle

This file was deleted.

34 changes: 4 additions & 30 deletions rxpm/build.gradle
Original file line number Diff line number Diff line change
@@ -1,13 +1,3 @@
buildscript {
repositories {
jcenter()
}
dependencies {
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.5'
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
}
}

apply plugin: 'com.android.library'
apply plugin: 'kotlin-android'

Expand Down Expand Up @@ -59,25 +49,9 @@ dependencies {
}

ext {
bintrayRepo = 'maven'
bintrayName = 'RxPM'
publishedGroupId = 'me.dmdev.rxpm'
artifact = 'rxpm'
libraryVersion = '2.1.1'
gitUrl = 'https://github.com/dmdevgo/RxPM'
allLicenses = ['MIT']
PUBLISH_GROUP_ID = 'me.dmdev.rxpm'
PUBLISH_VERSION = '2.1.2'
PUBLISH_ARTIFACT_ID = 'rxpm'
}

// Configuration of the library uploading to the Bintray
// Note: Call 'bintrayUpload' task (it will execute 'install' task first)
apply from: 'androidmaven.gradle'
apply from: 'bintray.gradle'

task sourcesJar(type: Jar) {
from android.sourceSets.main.java.srcDirs
archiveClassifier.set("sources")
}

artifacts {
archives sourcesJar
}
apply from: "publish-mavencentral.gradle"
116 changes: 116 additions & 0 deletions rxpm/publish-mavencentral.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,116 @@
apply plugin: 'maven-publish'
apply plugin: 'signing'

task androidSourcesJar(type: Jar) {
archiveClassifier.set('sources')
if (project.plugins.findPlugin("com.android.library")) {
from android.sourceSets.main.java.srcDirs
} else {
from sourceSets.main.java.srcDirs
}
}

artifacts {
archives androidSourcesJar
}


group = PUBLISH_GROUP_ID
version = PUBLISH_VERSION

ext["signing.keyId"] = ''
ext["signing.password"] = ''
ext["signing.secretKeyRingFile"] = ''
ext["ossrhUsername"] = ''
ext["ossrhPassword"] = ''
ext["sonatypeStagingProfileId"] = ''

File secretPropsFile = project.rootProject.file('local.properties')
if (secretPropsFile.exists()) {
Properties p = new Properties()
p.load(new FileInputStream(secretPropsFile))
p.each { name, value ->
ext[name] = value
}
} else {
ext["signing.keyId"] = System.getenv('SIGNING_KEY_ID')
ext["signing.password"] = System.getenv('SIGNING_PASSWORD')
ext["signing.secretKeyRingFile"] = System.getenv('SIGNING_SECRET_KEY_RING_FILE')
ext["ossrhUsername"] = System.getenv('OSSRH_USERNAME')
ext["ossrhPassword"] = System.getenv('OSSRH_PASSWORD')
ext["sonatypeStagingProfileId"] = System.getenv('SONATYPE_STAGING_PROFILE_ID')
}

publishing {
publications {
release(MavenPublication) {
groupId PUBLISH_GROUP_ID
artifactId PUBLISH_ARTIFACT_ID
version PUBLISH_VERSION
if (project.plugins.findPlugin("com.android.library")) {
artifact("$buildDir/outputs/aar/${project.getName()}-release.aar")
} else {
artifact("$buildDir/libs/${project.getName()}-${version}.jar")
}

artifact androidSourcesJar

pom {
name = PUBLISH_ARTIFACT_ID
description = 'Reactive implementation of Presentation Model pattern in Android'
url = 'https://github.com/dmdevgo/RxPM'
licenses {
license {
name = 'MIT'
url = 'https://github.com/dmdevgo/RxPM/blob/develop/LICENSE'
}
}
developers {
developer {
id = 'dmdev'
name = 'Dmitriy Gorbunov'
email = 'dmitriy.goto@gmail.com'
}
developer {
id = 'jeevuz'
name = 'Vasili Chyrvon'
email = 'vasili.chyrvon@gmail.com'
}
}
scm {
connection = 'scm:git@github.com:dmdevgo/RxPM.git'
developerConnection = 'scm:git@github.com:dmdevgo/RxPM.git'
url = 'https://github.com/dmdevgo/RxPM'
}
withXml {
def dependenciesNode = asNode().appendNode('dependencies')

project.configurations.implementation.allDependencies.each {
def dependencyNode = dependenciesNode.appendNode('dependency')
dependencyNode.appendNode('groupId', it.group)
dependencyNode.appendNode('artifactId', it.name)
dependencyNode.appendNode('version', it.version)
}
}
}
}
}
repositories {
maven {
name = "sonatype"

def releasesRepoUrl = "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
def snapshotsRepoUrl = "https://oss.sonatype.org/content/repositories/snapshots/"
url = version.endsWith('SNAPSHOT') ? snapshotsRepoUrl : releasesRepoUrl

credentials {
username ossrhUsername
password ossrhPassword
}
}
}
}

signing {
sign publishing.publications
}
25 changes: 25 additions & 0 deletions rxpm/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,2 +1,27 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ The MIT License (MIT)
~
~ Copyright (c) 2017-2021 Dmitriy Gorbunov (dmitriy.goto@gmail.com)
~ and Vasili Chyrvon (vasili.chyrvon@gmail.com)
~
~ Permission is hereby granted, free of charge, to any person obtaining a copy
~ of this software and associated documentation files (the "Software"), to deal
~ in the Software without restriction, including without limitation the rights
~ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
~ copies of the Software, and to permit persons to whom the Software is
~ furnished to do so, subject to the following conditions:
~
~ The above copyright notice and this permission notice shall be included in all
~ copies or substantial portions of the Software.
~
~ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
~ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
~ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
~ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
~ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
~ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
~ SOFTWARE.
-->

<manifest package="me.dmdev.rxpm"/>
25 changes: 25 additions & 0 deletions rxpm/src/main/kotlin/me/dmdev/rxpm/Action.kt
Original file line number Diff line number Diff line change
@@ -1,3 +1,28 @@
/*
* The MIT License (MIT)
*
* Copyright (c) 2017-2021 Dmitriy Gorbunov (dmitriy.goto@gmail.com)
* and Vasili Chyrvon (vasili.chyrvon@gmail.com)
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/

package me.dmdev.rxpm

import android.annotation.*
Expand Down
25 changes: 25 additions & 0 deletions rxpm/src/main/kotlin/me/dmdev/rxpm/Command.kt
Original file line number Diff line number Diff line change
@@ -1,3 +1,28 @@
/*
* The MIT License (MIT)
*
* Copyright (c) 2017-2021 Dmitriy Gorbunov (dmitriy.goto@gmail.com)
* and Vasili Chyrvon (vasili.chyrvon@gmail.com)
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/

package me.dmdev.rxpm

import com.jakewharton.rxrelay2.*
Expand Down
Loading

0 comments on commit d392ccf

Please sign in to comment.