Commit 0718aead authored by Matthieu's avatar Matthieu

Merge branch 'release_5' into 'master'

Alpha release 5

See merge request !257
parents d53a0086 16529b40
Pipeline #182 failed with stage
in 4 minutes and 39 seconds
......@@ -10,7 +10,7 @@ apply plugin: 'jacoco'
android {
compileSdkVersion 29
compileSdkVersion 30
buildToolsVersion '30.0.1'
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
......@@ -22,9 +22,9 @@ android {
defaultConfig {
applicationId "com.h.pixeldroid"
minSdkVersion 23
targetSdkVersion 29
versionCode 5
versionName "1.0.alpha4.1"
targetSdkVersion 30
versionCode 6
versionName "1.0.alpha5"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
testInstrumentationRunnerArguments clearPackageData: 'true'
......
......@@ -565,12 +565,6 @@
license: The Apache Software License, Version 2.0
licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
url: http://developer.android.com/tools/extras/support-library.html
- artifact: com.google.android:flexbox:+
name: flexbox
copyrightHolder: Google Inc.
license: The Apache Software License, Version 2.0
licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
url: https://github.com/google/flexbox-layout
- artifact: com.squareup.retrofit2:converter-gson:+
name: converter-gson
copyrightHolder: Square, Inc.
......@@ -726,3 +720,15 @@
url: http://www.jetbrains.org
- artifact: org.reactivestreams:reactive-streams:+
skip: true
- artifact: androidx.gridlayout:gridlayout:+
name: gridlayout
copyrightHolder: Google Inc
license: The Apache Software License, Version 2.0
licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
url: http://developer.android.com/tools/extras/support-library.html
- artifact: androidx.preference:preference-ktx:+
name: preference-ktx
copyrightHolder: Google Inc
license: The Apache Software License, Version 2.0
licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
url: https://developer.android.com/jetpack/androidx
This diff is collapsed.
......@@ -256,7 +256,7 @@ class MainActivity : AppCompatActivity() {
header.profiles.orEmpty()
.filter { it.identifier == ADD_ACCOUNT_IDENTIFIER }
.take(1)
.map { profiles.add(it) }
.forEach { profiles.add(it) }
header.clear()
header.profiles = profiles
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment