From 99b87b751c38f5531e334d21220bda251657a02a Mon Sep 17 00:00:00 2001 From: Nimrod Dayan Date: Sat, 13 Apr 2019 16:38:26 +0300 Subject: [PATCH 1/2] Updated Dagger to 2.22.1 --- app/src/main/java/org/codepond/commitbrowser/App.kt | 3 +-- .../main/java/org/codepond/commitbrowser/di/AppComponent.kt | 4 ++-- .../src/main/java/com/nimroddayan/buildsrc/dependencies.kt | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/org/codepond/commitbrowser/App.kt b/app/src/main/java/org/codepond/commitbrowser/App.kt index 561773c..3a9e64b 100644 --- a/app/src/main/java/org/codepond/commitbrowser/App.kt +++ b/app/src/main/java/org/codepond/commitbrowser/App.kt @@ -18,12 +18,11 @@ package org.codepond.commitbrowser import dagger.android.AndroidInjector import dagger.android.DaggerApplication -import org.codepond.commitbrowser.di.DaggerAppComponent import timber.log.Timber class App : DaggerApplication() { private val component: AndroidInjector by lazy { - DaggerAppComponent.builder().create(this) + DaggerAppComponent.factory().create(this) } override fun applicationInjector(): AndroidInjector { diff --git a/app/src/main/java/org/codepond/commitbrowser/di/AppComponent.kt b/app/src/main/java/org/codepond/commitbrowser/di/AppComponent.kt index 7d45ec9..9739351 100644 --- a/app/src/main/java/org/codepond/commitbrowser/di/AppComponent.kt +++ b/app/src/main/java/org/codepond/commitbrowser/di/AppComponent.kt @@ -35,6 +35,6 @@ import javax.inject.Singleton HomeActivityModule::class ]) interface AppComponent : AndroidInjector { - @Component.Builder - abstract class Builder : AndroidInjector.Builder() + @Component.Factory + interface Factory : AndroidInjector.Factory } diff --git a/buildSrc/src/main/java/com/nimroddayan/buildsrc/dependencies.kt b/buildSrc/src/main/java/com/nimroddayan/buildsrc/dependencies.kt index 1d71071..c3af9af 100644 --- a/buildSrc/src/main/java/com/nimroddayan/buildsrc/dependencies.kt +++ b/buildSrc/src/main/java/com/nimroddayan/buildsrc/dependencies.kt @@ -146,7 +146,7 @@ object Libs { } object Dagger { - private const val version = "2.21" + private const val version = "2.22.1" val dagger = "com.google.dagger:dagger:$version" val androidSupport = "com.google.dagger:dagger-android-support:$version" val compiler = "com.google.dagger:dagger-compiler:$version" From 076af794cbb47d1f1672dfc0d88f877beadcf524 Mon Sep 17 00:00:00 2001 From: Nimrod Dayan Date: Sat, 13 Apr 2019 16:35:53 +0300 Subject: [PATCH 2/2] Updated kotlin plugin to 1.3.30 --- app/build.gradle.kts | 12 ++++++------ .../org/codepond/commitbrowser/di/ViewModelKey.kt | 2 +- build.gradle.kts | 2 +- .../java/com/nimroddayan/buildsrc/dependencies.kt | 2 +- gradle.properties | 2 ++ 5 files changed, 11 insertions(+), 9 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 46a428d..781fb1b 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -15,7 +15,6 @@ */ import com.nimroddayan.buildsrc.Libs -import org.jetbrains.kotlin.gradle.internal.AndroidExtensionsExtension plugins { id("com.android.application") @@ -54,14 +53,15 @@ android { kapt { useBuildCache = true + arguments { + arg("dagger.formatGeneratedSource", "disabled") + arg("dagger.fastInit", "enabled") + arg("dagger.gradle.incremental") + } } androidExtensions { - // Workaround to get experimental features in Kotlin DSL - // https://youtrack.jetbrains.com/issue/KT-22213 - configure(delegateClosureOf { - isExperimental = true - }) + isExperimental = true } dependencies { diff --git a/app/src/main/java/org/codepond/commitbrowser/di/ViewModelKey.kt b/app/src/main/java/org/codepond/commitbrowser/di/ViewModelKey.kt index 7ef851b..b726f90 100644 --- a/app/src/main/java/org/codepond/commitbrowser/di/ViewModelKey.kt +++ b/app/src/main/java/org/codepond/commitbrowser/di/ViewModelKey.kt @@ -1,4 +1,4 @@ -```/* +/* * Copyright 2019 Nimrod Dayan nimroddayan.com * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/build.gradle.kts b/build.gradle.kts index 8dcb8ea..01eb6e9 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -21,7 +21,7 @@ buildscript { } dependencies { classpath("com.android.tools.build:gradle:3.4.0-rc03") - classpath(kotlin("gradle-plugin", version = "1.3.21")) + classpath(kotlin("gradle-plugin", version = "1.3.30")) classpath("androidx.navigation:navigation-safe-args-gradle-plugin:2.0.0") } } diff --git a/buildSrc/src/main/java/com/nimroddayan/buildsrc/dependencies.kt b/buildSrc/src/main/java/com/nimroddayan/buildsrc/dependencies.kt index c3af9af..fe9bcfa 100644 --- a/buildSrc/src/main/java/com/nimroddayan/buildsrc/dependencies.kt +++ b/buildSrc/src/main/java/com/nimroddayan/buildsrc/dependencies.kt @@ -19,7 +19,7 @@ package com.nimroddayan.buildsrc object Versions { val ktlint = "0.29.0" const val agp = "3.4.0-rc03" - const val kotlin = "1.3.21" + const val kotlin = "1.3.30" } object Libs { diff --git a/gradle.properties b/gradle.properties index be05d32..ddf2f8d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -30,3 +30,5 @@ android.enableSeparateAnnotationProcessing=true android.enableSeparateRClassCompilation=true # TODO: R8 will be the default in AGP 3.4 android.enableR8=true +kapt.incremental.apt=true +kapt.include.compile.classpath=false