Skip to content

Commit

Permalink
Merge pull request #135 from LouisCAD/develop
Browse files Browse the repository at this point in the history
Version 2.0.0-alpha5
  • Loading branch information
LouisCAD authored Nov 2, 2018
2 parents beb45da + 74bd7d2 commit 3f15a40
Show file tree
Hide file tree
Showing 223 changed files with 3,673 additions and 2,529 deletions.
7 changes: 3 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,7 @@ builds, without writing any code!
`BadTokenException`](https://github.com/drakeet/ToastCompat#why).
- **[Typesafe RecyclerView:](typesaferecyclerview)** Typesafe `ViewHolder` and `ItemViewHolder` for
easy basic usage of `RecyclerView`.
- **[UI Thread:](uithread)** Properties related to Android UI thread, and `checkUiThread()`
precondition checker.
- **[Main Thread:](mainthread)** Properties and precondition checkers related to Android main thread.
- **[View DSL:](viewdsl)** Create UIs with readable Kotlin code.
- **[View DSL AppCompat:](viewdsl-appcompat)** AppCompat extension of [View DSL](viewdsl).
- **[View DSL AppCompat styles:](viewdsl-appcompat-styles)** AppCompat styles for
Expand Down Expand Up @@ -98,7 +97,7 @@ into your root project `build.gradle` file:
```groovy
allProjects {
ext {
splitties_version = '2.0.0-alpha4'
splitties_version = '2.0.0-alpha5'
}
}
```
Expand Down Expand Up @@ -126,6 +125,7 @@ implementation "com.louiscad.splitties:splitties-fragmentargs:$splitties_version
implementation "com.louiscad.splitties:splitties-initprovider:$splitties_version"
implementation "com.louiscad.splitties:splitties-intents:$splitties_version"
implementation "com.louiscad.splitties:splitties-mainhandler:$splitties_version"
implementation "com.louiscad.splitties:splitties-mainthread:$splitties_version"
implementation "com.louiscad.splitties:splitties-material-colors:$splitties_version"
implementation "com.louiscad.splitties:splitties-material-lists:$splitties_version"
implementation "com.louiscad.splitties:splitties-preferences:$splitties_version"
Expand All @@ -138,7 +138,6 @@ debugImplementation "com.louiscad.splitties:splitties-stetho-init:$splitties_ver
implementation "com.louiscad.splitties:splitties-systemservices:$splitties_version"
implementation "com.louiscad.splitties:splitties-toast:$splitties_version"
implementation "com.louiscad.splitties:splitties-typesaferecyclerview:$splitties_version"
implementation "com.louiscad.splitties:splitties-uithread:$splitties_version"
implementation "com.louiscad.splitties:splitties-viewdsl:$splitties_version"
implementation "com.louiscad.splitties:splitties-viewdsl-appcompat:$splitties_version"
implementation "com.louiscad.splitties:splitties-viewdsl-appcompat-styles:$splitties_version"
Expand Down
26 changes: 15 additions & 11 deletions RELEASING.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,24 @@

## Releasing a stable, beta or alpha version

1. Change the `library_version` ext property in root project's `build.gradle`
1. Checkout the `develop` branch, if not already done.
2. Change the `library_version` ext property in root project's `build.gradle`
file to a non-SNAPSHOT version.
2. Update the `README.md` with the new version.
3. Run `git commit -am "Prepare for release X.Y.Z"`
3. Update the `README.md` with the new version.
4. Run `git commit -am "Prepare for release X.Y.Z"`
(where X.Y.Z is the new version).
4. `git tag -a vX.Y.Z -m "Version X.Y.Z"` (where X.Y.Z is the new version).
5. Run `./gradlew clean bintrayUpload`.
6. Run `git push origin`.
7. Sign in on Bintray and publish the packages.
8. Change the `library_version` ext property in root project back to a
5. `git tag -a vX.Y.Z -m "Version X.Y.Z"` (where X.Y.Z is the new version).
6. Run `./gradlew clean bintrayUpload`.
7. Run `git push origin`.
8. Create a pull request from the `develop` to the `master` branch on GitHub for the new version, if not already done.
9. Sign in on Bintray and publish the packages.
10. Run `git push origin --tags`.
11. Merge the pull request for the new version on GitHub.
12. Publish release on GitHub.
13. Change the `library_version` ext property in root project back to a
-SNAPSHOT version.
9. Run `git commit -am "Prepare next development version."`.
10. Run `git push origin && git push origin --tags`.
11. Publish release on GitHub.
14. Run `git commit -am "Prepare next development version."`.
15. Run `git push origin`.

## Publishing a SNAPSHOT

Expand Down
1 change: 0 additions & 1 deletion activities/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ android {
buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
sourceSets {
Expand Down
21 changes: 0 additions & 21 deletions activities/proguard-rules.pro

This file was deleted.

1 change: 0 additions & 1 deletion alertdialog-appcompat/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ android {
buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
sourceSets {
Expand Down
21 changes: 0 additions & 21 deletions alertdialog-appcompat/proguard-rules.pro

This file was deleted.

1 change: 0 additions & 1 deletion alertdialog/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ android {
buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
sourceSets {
Expand Down
21 changes: 0 additions & 21 deletions alertdialog/proguard-rules.pro

This file was deleted.

1 change: 0 additions & 1 deletion appctx/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ android {
buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
}
Expand Down
25 changes: 0 additions & 25 deletions appctx/proguard-rules.pro

This file was deleted.

1 change: 0 additions & 1 deletion arch-lifecycle/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ android {
buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
}
Expand Down
21 changes: 0 additions & 21 deletions arch-lifecycle/proguard-rules.pro

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -56,20 +56,20 @@ inline fun <T : Any> LifecycleOwner.observeNotNull(
*/
inline fun <X, Y> LiveData<X>.map(
crossinline transform: (X?) -> Y
): LiveData<Y> = Transformations.map(this, { input -> transform(input) })
): LiveData<Y> = Transformations.map(this) { input -> transform(input) }

inline fun <X, Y> LiveData<X>.mapNotNull(
crossinline transform: (X) -> Y
): LiveData<Y> = Transformations.map(this, { input: X? ->
): LiveData<Y> = Transformations.map(this) { input: X? ->
input?.let { transform(it) }
})
}

inline fun <X, Y> LiveData<X>.switchMap(
crossinline transform: (X?) -> LiveData<Y>?
): LiveData<Y> = Transformations.switchMap(this, { input -> transform(input) })
): LiveData<Y> = Transformations.switchMap(this) { input -> transform(input) }

inline fun <X, Y> LiveData<X>.switchMapNotNull(
crossinline transform: (X) -> LiveData<Y>?
): LiveData<Y> = Transformations.switchMap(this, { input: X? ->
): LiveData<Y> = Transformations.switchMap(this) { input: X? ->
input?.let { transform(it) }
})
}
1 change: 0 additions & 1 deletion arch-room/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ android {
buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
}
Expand Down
21 changes: 0 additions & 21 deletions arch-room/proguard-rules.pro

This file was deleted.

1 change: 0 additions & 1 deletion bitflags/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ android {
buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
sourceSets {
Expand Down
21 changes: 0 additions & 21 deletions bitflags/proguard-rules.pro

This file was deleted.

24 changes: 12 additions & 12 deletions bitflags/src/main/java/splitties/bitflags/BitFlags.kt
Original file line number Diff line number Diff line change
Expand Up @@ -23,18 +23,18 @@ import kotlin.experimental.and
import kotlin.experimental.inv
import kotlin.experimental.or

@CheckResult inline fun Long.hasFlag(flag: Long) = flag and this == flag
@CheckResult inline fun Long.withFlag(flag: Long) = this or flag
@CheckResult inline fun Long.minusFlag(flag: Long) = this and flag.inv()
@CheckResult inline fun Long.hasFlag(flag: Long): Boolean = flag and this == flag
@CheckResult inline fun Long.withFlag(flag: Long): Long = this or flag
@CheckResult inline fun Long.minusFlag(flag: Long): Long = this and flag.inv()

@CheckResult inline fun Int.hasFlag(flag: Int) = flag and this == flag
@CheckResult inline fun Int.withFlag(flag: Int) = this or flag
@CheckResult inline fun Int.minusFlag(flag: Int) = this and flag.inv()
@CheckResult inline fun Int.hasFlag(flag: Int): Boolean = flag and this == flag
@CheckResult inline fun Int.withFlag(flag: Int): Int = this or flag
@CheckResult inline fun Int.minusFlag(flag: Int): Int = this and flag.inv()

@CheckResult inline fun Short.hasFlag(flag: Short) = flag and this == flag
@CheckResult inline fun Short.withFlag(flag: Short) = this or flag
@CheckResult inline fun Short.minusFlag(flag: Short) = this and flag.inv()
@CheckResult inline fun Short.hasFlag(flag: Short): Boolean = flag and this == flag
@CheckResult inline fun Short.withFlag(flag: Short): Short = this or flag
@CheckResult inline fun Short.minusFlag(flag: Short): Short = this and flag.inv()

@CheckResult inline fun Byte.hasFlag(flag: Byte) = flag and this == flag
@CheckResult inline fun Byte.withFlag(flag: Byte) = this or flag
@CheckResult inline fun Byte.minusFlag(flag: Byte) = this and flag.inv()
@CheckResult inline fun Byte.hasFlag(flag: Byte): Boolean = flag and this == flag
@CheckResult inline fun Byte.withFlag(flag: Byte): Byte = this or flag
@CheckResult inline fun Byte.minusFlag(flag: Byte): Byte = this and flag.inv()
12 changes: 6 additions & 6 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.

buildscript {
ext.kotlin_version = '1.2.51'
ext.kotlin_version = '1.2.71'
repositories {
google()
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.2.0-beta02'
classpath 'com.android.tools.build:gradle:3.2.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.0'
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
Expand All @@ -40,22 +40,22 @@ allprojects {
jcenter()
}
ext {
projectBuildTools_version = '27.0.3'
projectBuildTools_version = '28.0.3'
projectSdk_version = 27

// Libraries
groupId = "com.louiscad.splitties"
library_version = "2.0.0-alpha4"
library_version = "2.0.0-alpha5"
isSnapshot = library_version.endsWith("-SNAPSHOT")
isRelease = !isSnapshot

// Dependencies versions
supportLibs_version = '27.1.1'
arch_lifecycle_version = '1.1.1'
arch_room_version = '1.0.0'
constraintLayout_version = '1.1.0'
constraintLayout_version = '1.1.3'
timber_version = '4.7.1'
kotlinxCoroutines_version = '0.23.4'
kotlinxCoroutines_version = '0.30.2'
}
}

Expand Down
Loading

0 comments on commit 3f15a40

Please sign in to comment.