diff --git a/app/build.gradle b/app/build.gradle index ab5a544..87b4faa 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -33,8 +33,8 @@ dependencies { implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha2' - implementation 'com.squareup.okhttp3:okhttp:3.11.0' - implementation 'com.squareup.retrofit2:retrofit:2.4.0' + implementation 'com.squareup.okhttp3:okhttp:3.12.1' + implementation 'com.squareup.retrofit2:retrofit:2.5.0' implementation 'com.squareup.retrofit2:converter-gson:2.4.0' implementation 'com.squareup.picasso:picasso:2.71828' diff --git a/app/src/main/java/com/prolificinteractive/sample/CharactersAdapter.kt b/app/src/main/java/com/prolificinteractive/sample/CharactersAdapter.kt index 666f99f..cf62217 100644 --- a/app/src/main/java/com/prolificinteractive/sample/CharactersAdapter.kt +++ b/app/src/main/java/com/prolificinteractive/sample/CharactersAdapter.kt @@ -15,7 +15,7 @@ import kotlinx.android.synthetic.main.item_character.view.name class CharactersAdapter(var data: List = emptyList()) : RecyclerView.Adapter() { - class ItemViewHolder(val view: View) : RecyclerView.ViewHolder(view) { + class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { val image: ImageView = view.image val name: TextView = view.name } diff --git a/app/src/main/java/com/prolificinteractive/sample/api/RickAndMortyApi.kt b/app/src/main/java/com/prolificinteractive/sample/api/RickAndMortyApi.kt index e748428..67a2c49 100644 --- a/app/src/main/java/com/prolificinteractive/sample/api/RickAndMortyApi.kt +++ b/app/src/main/java/com/prolificinteractive/sample/api/RickAndMortyApi.kt @@ -5,5 +5,5 @@ import retrofit2.Call import retrofit2.http.GET interface RickAndMortyApi { - @GET(" character/") fun getCharacters(): Call + @GET("character/") fun getCharacters(): Call } \ No newline at end of file diff --git a/birdo/build.gradle b/birdo/build.gradle index 519b622..d654738 100644 --- a/birdo/build.gradle +++ b/birdo/build.gradle @@ -2,6 +2,7 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' apply plugin: 'kotlin-android-extensions' apply plugin: 'com.github.dcendents.android-maven' +apply plugin: 'org.jetbrains.dokka-android' android { compileSdkVersion 28 @@ -15,7 +16,9 @@ android { } dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" + + api 'io.palaima.debugdrawer:debugdrawer-base:0.8.0' implementation 'io.palaima.debugdrawer:debugdrawer-view:0.8.0' implementation 'io.palaima.debugdrawer:debugdrawer-commons:0.8.0' @@ -32,12 +35,12 @@ dependencies { implementation 'com.jakewharton.timber:timber:4.7.1' api 'com.squareup:seismic:1.0.2' - compileOnly 'com.squareup.okhttp3:okhttp:3.11.0' + compileOnly 'com.squareup.okhttp3:okhttp:3.12.1' compileOnly "com.squareup.picasso:picasso:2.71828" implementation 'androidx.appcompat:appcompat:1.0.2' testImplementation 'junit:junit:4.12' - androidTestImplementation 'androidx.test:runner:1.1.0' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0' + androidTestImplementation 'androidx.test:runner:1.1.1' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1' } diff --git a/build.gradle b/build.gradle index 10f4e3e..1a50e5f 100644 --- a/build.gradle +++ b/build.gradle @@ -1,16 +1,19 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.3.10' + ext.kotlin_version = '1.3.21' + ext.dokka_version = '0.9.17' repositories { google() jcenter() } + dependencies { - classpath 'com.android.tools.build:gradle:3.2.1' + classpath 'com.android.tools.build:gradle:3.3.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0' + classpath "org.jetbrains.dokka:dokka-android-gradle-plugin:$dokka_version" } } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 01b8bf6..87b738c 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index fb7ef98..5a7a6a1 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-5.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-bin.zip diff --git a/gradlew b/gradlew index cccdd3d..af6708f 100755 --- a/gradlew +++ b/gradlew @@ -28,7 +28,7 @@ APP_NAME="Gradle" APP_BASE_NAME=`basename "$0"` # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" +DEFAULT_JVM_OPTS='"-Xmx64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD="maximum" diff --git a/gradlew.bat b/gradlew.bat index e95643d..0f8d593 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -14,7 +14,7 @@ set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= +set DEFAULT_JVM_OPTS="-Xmx64m" @rem Find java.exe if defined JAVA_HOME goto findJavaFromJavaHome