mirror of https://github.com/YTVanced/VancedMicroG
Move kotlin extension from play-services-basement to play-services-basement-ktx
This commit is contained in:
parent
a7eb9a2732
commit
41a32d93fe
|
@ -9,7 +9,7 @@ apply plugin: 'maven-publish'
|
||||||
apply plugin: 'signing'
|
apply plugin: 'signing'
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
api project(':play-services-basement')
|
api project(':play-services-basement-ktx')
|
||||||
api "androidx.lifecycle:lifecycle-service:$lifecycleVersion"
|
api "androidx.lifecycle:lifecycle-service:$lifecycleVersion"
|
||||||
|
|
||||||
implementation "androidx.annotation:annotation:$annotationVersion"
|
implementation "androidx.annotation:annotation:$annotationVersion"
|
||||||
|
|
|
@ -0,0 +1,32 @@
|
||||||
|
/*
|
||||||
|
* SPDX-FileCopyrightText: 2021, microG Project Team
|
||||||
|
* SPDX-License-Identifier: Apache-2.0
|
||||||
|
*/
|
||||||
|
|
||||||
|
apply plugin: 'com.android.library'
|
||||||
|
apply plugin: 'kotlin-android'
|
||||||
|
apply plugin: 'maven-publish'
|
||||||
|
apply plugin: 'signing'
|
||||||
|
|
||||||
|
dependencies {
|
||||||
|
api project(":play-services-basement")
|
||||||
|
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
|
||||||
|
}
|
||||||
|
|
||||||
|
android {
|
||||||
|
compileSdkVersion androidCompileSdk
|
||||||
|
buildToolsVersion "$androidBuildVersionTools"
|
||||||
|
|
||||||
|
sourceSets {
|
||||||
|
main.java.srcDirs += 'src/main/kotlin'
|
||||||
|
}
|
||||||
|
|
||||||
|
compileOptions {
|
||||||
|
sourceCompatibility = 1.8
|
||||||
|
targetCompatibility = 1.8
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
apply from: '../gradle/publish-android.gradle'
|
||||||
|
|
||||||
|
description = 'microG kotlin extensions for play-services-basement'
|
|
@ -0,0 +1,7 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<!--
|
||||||
|
~ SPDX-FileCopyrightText: 2021, microG Project Team
|
||||||
|
~ SPDX-License-Identifier: Apache-2.0
|
||||||
|
-->
|
||||||
|
|
||||||
|
<manifest package="org.microg.gms.basement.ktx" />
|
|
@ -15,7 +15,6 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
apply plugin: 'com.android.library'
|
apply plugin: 'com.android.library'
|
||||||
apply plugin: 'kotlin-android'
|
|
||||||
apply plugin: 'maven-publish'
|
apply plugin: 'maven-publish'
|
||||||
apply plugin: 'signing'
|
apply plugin: 'signing'
|
||||||
|
|
||||||
|
@ -23,7 +22,6 @@ dependencies {
|
||||||
api "org.microg:safe-parcel:$safeParcelVersion"
|
api "org.microg:safe-parcel:$safeParcelVersion"
|
||||||
|
|
||||||
implementation "androidx.annotation:annotation:$annotationVersion"
|
implementation "androidx.annotation:annotation:$annotationVersion"
|
||||||
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
|
|
||||||
}
|
}
|
||||||
|
|
||||||
android {
|
android {
|
||||||
|
@ -42,10 +40,6 @@ android {
|
||||||
buildConfigField "int", "VERSION_CODE", "$appVersionCode"
|
buildConfigField "int", "VERSION_CODE", "$appVersionCode"
|
||||||
}
|
}
|
||||||
|
|
||||||
sourceSets {
|
|
||||||
main.java.srcDirs += 'src/main/kotlin'
|
|
||||||
}
|
|
||||||
|
|
||||||
compileOptions {
|
compileOptions {
|
||||||
sourceCompatibility = 1.8
|
sourceCompatibility = 1.8
|
||||||
targetCompatibility = 1.8
|
targetCompatibility = 1.8
|
||||||
|
|
|
@ -17,10 +17,30 @@ include ':play-services-wearable-api'
|
||||||
|
|
||||||
include ':play-services-api'
|
include ':play-services-api'
|
||||||
|
|
||||||
|
include ':play-services-base'
|
||||||
|
include ':play-services-cast'
|
||||||
|
include ':play-services-droidguard'
|
||||||
|
include ':play-services-gcm'
|
||||||
|
include ':play-services-iid'
|
||||||
|
include ':play-services-location'
|
||||||
|
include ':play-services-nearby'
|
||||||
|
include ':play-services-vision'
|
||||||
|
include ':play-services-vision-common'
|
||||||
|
include ':play-services-wearable'
|
||||||
|
|
||||||
|
include ':play-services'
|
||||||
|
|
||||||
|
include ':firebase-auth-api'
|
||||||
|
include ':firebase-dynamic-links-api'
|
||||||
|
|
||||||
|
// core only
|
||||||
|
|
||||||
include ':play-services-core-proto'
|
include ':play-services-core-proto'
|
||||||
include ':play-services-nearby-core-proto'
|
include ':play-services-nearby-core-proto'
|
||||||
include ':play-services-wearable-proto'
|
include ':play-services-wearable-proto'
|
||||||
|
|
||||||
|
include ':play-services-basement-ktx'
|
||||||
|
|
||||||
include ':play-services-base-core'
|
include ':play-services-base-core'
|
||||||
include ':play-services-conscrypt-provider-core'
|
include ':play-services-conscrypt-provider-core'
|
||||||
include ':play-services-cronet-core'
|
include ':play-services-cronet-core'
|
||||||
|
@ -35,23 +55,7 @@ include ':play-services-vision-core'
|
||||||
include ':play-services-base-core-ui'
|
include ':play-services-base-core-ui'
|
||||||
include ':play-services-nearby-core-ui'
|
include ':play-services-nearby-core-ui'
|
||||||
|
|
||||||
include ':firebase-auth-api'
|
|
||||||
include ':firebase-dynamic-links-api'
|
|
||||||
|
|
||||||
include ':firebase-auth-core'
|
include ':firebase-auth-core'
|
||||||
|
|
||||||
include ':play-services-core:microg-ui-tools' // Legacy
|
include ':play-services-core:microg-ui-tools' // Legacy
|
||||||
include ':play-services-core'
|
include ':play-services-core'
|
||||||
|
|
||||||
include ':play-services-base'
|
|
||||||
include ':play-services-cast'
|
|
||||||
include ':play-services-droidguard'
|
|
||||||
include ':play-services-gcm'
|
|
||||||
include ':play-services-iid'
|
|
||||||
include ':play-services-location'
|
|
||||||
include ':play-services-nearby'
|
|
||||||
include ':play-services-vision'
|
|
||||||
include ':play-services-vision-common'
|
|
||||||
include ':play-services-wearable'
|
|
||||||
|
|
||||||
include ':play-services'
|
|
||||||
|
|
Loading…
Reference in New Issue