mirror/matomocamp-companion-android
1
0
Fork 0
mirror of https://github.com/MatomoCamp/matomocamp-companion-android.git synced 2024-09-19 16:13:46 +02:00
Code Releases Activity

update Gradle Plugin to 4.2.0, Kotlin to 1.5.0, fragment-ktx to 1.3.3 and Room to 2.3.0

Browse source
This commit is contained in:
Christophe Beyls 2021-05-07 22:20:26 +02:00
parent 44e9e69a5d
commit 0b707b5872
5 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/build.gradle
View file

@ -68,12 +68,12 @@ android {
dependencies {
def lifecycle_version = "2.3.1"
def room_version = "2.2.6"
def room_version = "2.3.0"
def okhttp_version = "3.12.13"
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.3'
implementation 'androidx.core:core-ktx:1.3.2'
implementation 'androidx.fragment:fragment-ktx:1.3.2'
implementation 'androidx.fragment:fragment-ktx:1.3.3'
implementation 'androidx.appcompat:appcompat:1.2.0'
implementation 'com.google.android.material:material:1.3.0'
implementation 'androidx.coordinatorlayout:coordinatorlayout:1.1.0'

4
app/src/main/java/be/digitalia/fosdem/model/Track.kt
View file

@ -13,13 +13,11 @@ import kotlinx.parcelize.Parcelize
@Parcelize
data class Track(
@PrimaryKey
val id: Long,
val id: Long = 0L,
val name: String,
val type: Type
) : Parcelable {
constructor(name: String, type: Type) : this(0L, name, type)
enum class Type(@StringRes @get:StringRes val nameResId: Int,
@ColorRes @get:ColorRes val appBarColorResId: Int,
@ColorRes @get:ColorRes val statusBarColorResId: Int,

2
app/src/main/java/be/digitalia/fosdem/parsers/EventsParser.kt
View file

@ -144,7 +144,7 @@ class EventsParser : Parser<Sequence<DetailedEvent>> {
slug = slug,
title = title,
subTitle = subTitle,
track = Track(trackName, trackType),
track = Track(name = trackName, type = trackType),
abstractText = abstractText,
description = description,
personsSummary = null

8
build.gradle
View file

@ -1,12 +1,12 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
ext.kotlin_version = '1.4.32'
ext.kotlin_version = '1.5.0'
repositories {
google()
jcenter()
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:4.1.3'
classpath 'com.android.tools.build:gradle:4.2.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}
@ -20,6 +20,6 @@ allprojects {
}
}
google()
jcenter()
mavenCentral()
}
}

2
gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip