Fix licenses and generic build

pull/1330/head
Alex Baker 4 years ago
parent 94214ee059
commit 6cb4ff4aa6

@ -578,8 +578,8 @@
license: The Apache Software License, Version 2.0
licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
url: https://developer.android.com/jetpack/androidx
- artifact: org.jetbrains.kotlinx:kotlinx-coroutines-core:+
name: kotlinx-coroutines-core
- artifact: org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:+
name: kotlinx-coroutines-core-jvm
copyrightHolder: JetBrains s.r.o.
license: The Apache Software License, Version 2.0
licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
@ -708,12 +708,6 @@
license: The Apache Software License, Version 2.0
licenseUrl: https://www.apache.org/licenses/LICENSE-2.0.txt
url: https://github.com/google/dagger
- artifact: javax.annotation:jsr250-api:+
name: jsr250-api
copyrightHolder: Sun Microsystems, Inc
license: COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
licenseUrl: https://glassfish.dev.java.net/public/CDDLv1.0.html
url: http://jcp.org/aboutJava/communityprocess/final/jsr250/index.html
- artifact: androidx.room:room-ktx:+
name: room-ktx
copyrightHolder: Android Open Source Project

@ -5,18 +5,20 @@ import dagger.Module
import dagger.Provides
import dagger.hilt.InstallIn
import dagger.hilt.android.components.ActivityComponent
import dagger.hilt.android.components.ViewModelComponent
import dagger.hilt.android.qualifiers.ApplicationContext
import dagger.hilt.android.scopes.ActivityScoped
import dagger.hilt.android.scopes.ViewModelScoped
import org.tasks.location.MapFragment
import org.tasks.location.MapboxMapFragment
import org.tasks.location.MapboxSearchProvider
import org.tasks.location.PlaceSearchProvider
@Module
@InstallIn(ActivityComponent::class)
@InstallIn(ActivityComponent::class, ViewModelComponent::class)
class LocationModule {
@Provides
@ActivityScoped
@ViewModelScoped
fun getPlaceSearchProvider(@ApplicationContext context: Context): PlaceSearchProvider {
return MapboxSearchProvider(context)
}

@ -1369,7 +1369,7 @@
},
{
"artifactId": {
"name": "kotlinx-coroutines-core",
"name": "kotlinx-coroutines-core-jvm",
"group": "org.jetbrains.kotlinx",
"version": "+"
},
@ -1379,7 +1379,7 @@
"licenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.txt",
"normalizedLicense": "apache2",
"url": "https://github.com/Kotlin/kotlinx.coroutines",
"libraryName": "kotlinx-coroutines-core"
"libraryName": "kotlinx-coroutines-core-jvm"
},
{
"artifactId": {
@ -1689,20 +1689,6 @@
"url": "https://github.com/google/dagger",
"libraryName": "dagger-lint-aar"
},
{
"artifactId": {
"name": "jsr250-api",
"group": "javax.annotation",
"version": "+"
},
"copyrightHolder": "Sun Microsystems, Inc",
"copyrightStatement": "Copyright © Sun Microsystems, Inc. All rights reserved.",
"license": "COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0",
"licenseUrl": "https://glassfish.dev.java.net/public/CDDLv1.0.html",
"normalizedLicense": "cddl1",
"url": "http://jcp.org/aboutJava/communityprocess/final/jsr250/index.html",
"libraryName": "jsr250-api"
},
{
"artifactId": {
"name": "room-ktx",

Loading…
Cancel
Save