Skip to content

Commit d920e6f

Browse files
authored
Release 2.2.0 (#537)
* Release 2.2.0 * Bump dokka and publish versions
1 parent 29f2f6d commit d920e6f

File tree

7 files changed

+18
-9
lines changed

7 files changed

+18
-9
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
# Change Log
2+
## 2.2.0
3+
- Fix subscriptionLifecycleOwner to use viewLifecycleOwner in Fragment's onCreateView (#533)
4+
- Remove createUnsafe and don't auto-subscribe on background threads (#525)
5+
- Fix lifecycle 2.3.0 throwing IllegalStateException when using `MavericksLauncherActivity` (#523)
26

37
## 2.1.0
48
- Upgraded to Kotlin 1.4.30.

build.gradle

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import com.airbnb.mvrx.AndroidMetaModulePlugin
33
buildscript {
44
repositories {
55
google()
6+
mavenCentral()
67
jcenter()
78
}
89
dependencies {
@@ -13,7 +14,9 @@ buildscript {
1314

1415
// Upload with:
1516
// ./gradlew clean assemble uploadArchives --no-daemon --no-parallel
16-
classpath "com.vanniktech:gradle-maven-publish-plugin:0.12.0"
17+
classpath "com.vanniktech:gradle-maven-publish-plugin:0.14.2"
18+
// Dokka is needed on classpath for vanniktech publish plugin
19+
classpath "org.jetbrains.dokka:dokka-gradle-plugin:1.4.30"
1720
}
1821

1922
configurations.all {
@@ -38,6 +41,7 @@ allprojects {
3841

3942
repositories {
4043
google()
44+
mavenCentral()
4145
jcenter()
4246
}
4347
}

buildSrc/src/main/java/dependencies.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ object Versions {
22
// Build tools and SDK
33
const val buildTools = "30.0.3"
44
const val compileSdk = 30
5-
const val gradlePlugin = "7.0.0-alpha08"
6-
const val kotlin = "1.4.30"
5+
const val gradlePlugin = "7.0.0-alpha14"
6+
const val kotlin = "1.4.32"
77
const val minSdk = 16
88
const val targetSdk = 29
99

@@ -31,7 +31,7 @@ object Versions {
3131
const val epoxy = "4.0.0"
3232
const val hilt = "2.31.1-alpha"
3333
const val koin = "2.0.1"
34-
const val kotlinCoroutines = "1.4.1"
34+
const val kotlinCoroutines = "1.4.3"
3535
const val lottie = "3.4.0"
3636
const val moshi = "1.9.2"
3737
const val multidex = "2.0.1"

gradle.properties

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
VERSION_NAME=2.1.0-SNAPSHOT
1+
VERSION_NAME=2.3.0-SNAPSHOT
22
GROUP=com.airbnb.android
33
POM_DESCRIPTION=Mavericks is an Android application framework that makes product development fast and fun.
44
POM_URL=https://github.com/airbnb/mavericks
@@ -13,6 +13,7 @@ POM_DEVELOPER_NAME=Airbnb
1313
POM_INCEPTION_YEAR=2018
1414
android.useAndroidX=true
1515
# With the default memory size Gradle gets out of memory issues when building, so we have to increase it
16-
org.gradle.jvmargs=-Xms128m -Xmx2048m -XX:+CMSClassUnloadingEnabled
16+
# Dokka fails without a larger metaspace https://github.com/Kotlin/dokka/issues/1405
17+
org.gradle.jvmargs=-Xms128m -Xmx2048m -XX:+CMSClassUnloadingEnabled -XX:MaxMetaspaceSize=1g
1718
# Set to false if you want to use Proguard
1819
android.enableR8=true
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-all.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

mvrx-rxjava2/src/main/kotlin/com/airbnb/mvrx/MvRxView.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,4 +224,4 @@ private class JobDisposable(job: Job) : AtomicReference<Job>(job), Disposable {
224224
override fun isDisposed(): Boolean = get()?.isActive?.not() ?: true
225225
}
226226

227-
internal fun Job.toDisposable(): Disposable = JobDisposable(this)
227+
internal fun Job.toDisposable(): Disposable = JobDisposable(this)

mvrx/src/main/kotlin/com/airbnb/mvrx/MavericksView.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ interface MavericksView : LifecycleOwner {
7171
val subscriptionLifecycleOwner: LifecycleOwner
7272
get() = try {
7373
(this as? Fragment)?.viewLifecycleOwner ?: this
74-
} catch(e: IllegalStateException) {
74+
} catch (e: IllegalStateException) {
7575
this
7676
}
7777

0 commit comments

Comments
 (0)