Skip to content

Commit

Permalink
pre version 1.0.0, updated deps, fixes in .idea folder
Browse files Browse the repository at this point in the history
  • Loading branch information
luca committed May 6, 2020
1 parent 00bafda commit 40b7e1b
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 16 deletions.
2 changes: 1 addition & 1 deletion .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 2 additions & 5 deletions .idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@
buildscript {

ext {
android_gradle_ver = '3.6.1'
android_gradle_ver = '3.6.3'

kotlin_ver = '1.3.70'
kotlin_ver = '1.3.72'
ktlint_ver = '0.36.0'
retrofit_ver = '2.7.1'
retrofit_ver = '2.8.1'
moshi_ver = '1.9.2'
okhttp_ver = '4.3.1'
mdc_ver = '1.1.0-rc02'
okhttp_ver = '4.6.0'
mdc_ver = '1.1.0'
epoxy_ver = '3.9.0'
junit_ver = '4.13'
leak_ver = '2.0'
leak_ver = '2.2'
}
repositories {
google()
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
2 changes: 1 addition & 1 deletion lib/src/main/java/com/kirkbushman/zammad/models/User.kt
Original file line number Diff line number Diff line change
Expand Up @@ -145,4 +145,4 @@ data class User(
@Json(name = "groups")
val groups: @RawValue Map<String, List<String>>?

): Parcelable, Identifiable, Creatable, Updatable
) : Parcelable, Identifiable, Creatable, Updatable
4 changes: 2 additions & 2 deletions sampleapp/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ apply plugin: 'kotlin-kapt'

android {
compileSdkVersion 29
buildToolsVersion "29.0.2"
buildToolsVersion "29.0.3"

defaultConfig {
applicationId "com.kirkbushman.sampleapp"
Expand Down Expand Up @@ -54,5 +54,5 @@ dependencies {
kapt "com.airbnb.android:epoxy-processor:$epoxy_ver"

implementation "com.google.android.material:material:$mdc_ver"
implementation 'androidx.core:core-ktx:1.2.0-rc01'
implementation 'androidx.core:core-ktx:1.3.0-rc01'
}

0 comments on commit 40b7e1b

Please sign in to comment.