Skip to content

Add incremental APs and disable Google Play services plugin #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wolfs merged 2 commits into from
Aug 9, 2019
Merged

Add incremental APs and disable Google Play services plugin #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
048ee6f
Update libraries to support incremental annotation processing
gavra0 Aug 7, 2019
76cb3b8
Disable Google Play services plugin
gavra0 Aug 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,13 @@
*/

buildscript {
ext.kotlin = '1.3.40'
ext.kotlin = '1.3.50-eap-54'
ext.spotless = '3.15.0'
ext.ktlint = '0.28.0'
ext.googlejavaformat = '1.6'

repositories {
maven { url 'https://dl.bintray.com/kotlin/kotlin-eap' }
google()
jcenter()
}
Expand Down Expand Up @@ -64,12 +65,12 @@ ext {
supportWearable = "com.google.android.support:wearable:2.3.0"
providedWear = "com.google.android.wearable:wearable:2.3.0"

archLifecycle = '2.0.0'
archLifecycle = '2.2.0-alpha02'
archLifecycleRuntime = "androidx.lifecycle:lifecycle-runtime:$archLifecycle"
archLifecycleExtentions = "androidx.lifecycle:lifecycle-extensions:$archLifecycle"
archLifecycleCompiler = "androidx.lifecycle:lifecycle-compiler:$archLifecycle"

archRoom = "2.0.0"
archRoom = "2.2.0-alpha01"
archRoomRuntime = "androidx.room:room-runtime:$archRoom"
archRoomCompiler = "androidx.room:room-compiler:$archRoom"
archRoomTesting = "androidx.room:room-testing:$archRoom"
Expand All @@ -95,7 +96,7 @@ ext {
firebaseMessaging = 'com.google.firebase:firebase-messaging:17.3.3'
firebaseStorage = 'com.google.firebase:firebase-storage:16.0.1'

dagger = '2.17'
dagger = '2.23.2'
daggerCore = "com.google.dagger:dagger:$dagger"
daggerAndroid = "com.google.dagger:dagger-android:$dagger"
daggerAndroidSupport = "com.google.dagger:dagger-android-support:$dagger"
Expand Down Expand Up @@ -175,6 +176,7 @@ subprojects {
}

repositories {
maven { url 'https://dl.bintray.com/kotlin/kotlin-eap' }
google()
mavenCentral()
jcenter()
Expand Down
13 changes: 11 additions & 2 deletions santa-tracker/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,15 @@ android {

testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
wearAppUnbundled true

javaCompileOptions {
annotationProcessorOptions {
arguments = [
"dagger.gradle.incremental": "true",
"room.incremental":"true"
]
}
}
}

buildTypes {
Expand Down Expand Up @@ -151,5 +160,5 @@ dependencies {
androidTestImplementation rootProject.ext.testingSupportRules
}

apply plugin: 'com.google.gms.google-services'
Comment thread
gavra0 marked this conversation as resolved.
apply plugin: 'com.google.android.gms.oss-licenses-plugin'
//apply plugin: 'com.google.gms.google-services'
apply plugin: 'com.google.android.gms.oss-licenses-plugin'
6 changes: 5 additions & 1 deletion tracker/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,11 @@ android {

javaCompileOptions {
annotationProcessorOptions {
arguments = ["room.schemaLocation": "$projectDir/schemas".toString()]
arguments = [
"room.schemaLocation": "$projectDir/schemas".toString(),
"room.incremental": "true",
"dagger.gradle.incremental": "true"
]
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion tracker/src/main/java/com/google/android/apps/santatracker/tracker/ui/TrackerMapFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ class TrackerMapFragment : SupportMapFragment(), SantaMarker.SantaMarkerInterfac
visitedDestinations = state.visitedDestinations
}

override fun onAttach(context: Context?) {
override fun onAttach(context: Context) {
super.onAttach(context)
val activity = activity ?: return
soundPlayer = TrackerSoundPlayer(activity)
Expand Down