Refactor vtm maps into seperate module, use version from maven (9f922b5a) · Commits · e / os / GmsCore

.gitmodules

+0 −3

Original line number	Diff line number	Diff line
		@@ -10,9 +10,6 @@
		[submodule "extern/GmsLib"]
		path = extern/GmsLib
		url = https://github.com/microg/android_external_GmsLib.git
		[submodule "extern/vtm"]
		path = extern/vtm
		url = https://github.com/microg/android_external_vtm.git
		[submodule "extern/RemoteDroidGuard"]
		path = extern/RemoteDroidGuard
		url = https://github.com/microg/android_packages_apps_RemoteDroidGuard.git

build.gradle

+9 −7

Original line number	Diff line number	Diff line
		/*
		* Copyright 2013-2017 microG Project Team
		* Copyright 2013-2019 microG Project Team
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		@@ -15,29 +15,31 @@
		*/

		buildscript {
		ext.kotlin_version = '1.3.21'
		repositories {
		jcenter()
		google()
		}
		dependencies {
		classpath 'com.android.tools.build:gradle:3.1.3'
		classpath 'com.android.tools.build:gradle:3.3.2'
		classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
		classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
		}
		}

		allprojects {
		apply plugin: 'idea'
		ext.androidBuildVersionTools = "27.0.3"
		ext.supportLibraryVersion = "27.1.0"
		ext.androidBuildVersionTools = "28.0.3"
		ext.supportLibraryVersion = "28.0.0"
		ext.isReleaseVersion = false
		ext.slf4jVersion = "1.7.25"
		}

		def androidCompileSdk() { return 27 }
		def androidCompileSdk() { return 28 }

		def androidTargetSdk() { return 27 }
		def androidTargetSdk() { return 28 }

		def androidMinSdk() { return 9 }
		def androidMinSdk() { return 14 }

		def versionCode() {
		def stdout = new ByteArrayOutputStream()

vtm @ a47215d9

Original line number	Diff line number	Diff line
		Subproject commit a47215d9848d5f0ebd1be7e281b48e531026a47f

gradle/wrapper/gradle-wrapper.properties

+1 −1

Original line number	Diff line number	Diff line
		@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
		distributionPath=wrapper/dists
		zipStoreBase=GRADLE_USER_HOME
		zipStorePath=wrapper/dists
		distributionUrl=https\://services.gradle.org/distributions/gradle-4.8-all.zip
		distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-all.zip

play-services-core/build.gradle

+12 −12

Original line number	Diff line number	Diff line
		@@ -19,9 +19,18 @@ apply plugin: 'com.android.application'
		dependencies {
		implementation "com.android.support:support-v4:$supportLibraryVersion"
		implementation "com.android.support:appcompat-v7:$supportLibraryVersion"
		implementation "com.squareup.wire:wire-runtime:1.6.1"
		implementation "com.takisoft.fix:preference-v7:$supportLibraryVersion.0"
		implementation "de.hdodenhof:circleimageview:1.3.0"
		implementation "com.squareup.wire:wire-runtime:1.6.1"
		implementation "org.conscrypt:conscrypt-android:2.0.0"
		implementation "org.microg:vtm-android:0.9.1-mod"
		implementation 'org.microg:vtm-android:0.9.1-mod:natives-armeabi'
		implementation 'org.microg:vtm-android:0.9.1-mod:natives-armeabi-v7a'
		implementation 'org.microg:vtm-android:0.9.1-mod:natives-arm64-v8a'
		implementation 'org.microg:vtm-android:0.9.1-mod:natives-x86'
		implementation 'org.microg:vtm-android:0.9.1-mod:natives-x86_64'
		implementation "org.microg:vtm-extras:0.9.1-mod"
		implementation "org.microg:vtm-jts:0.9.1-mod"

		implementation project(':microg-ui-tools')
		implementation project(':play-services-api')
		@@ -30,13 +39,7 @@ dependencies {
		implementation project(':wearable-lib')

		implementation project(':remote-droid-guard-lib')

		implementation project(':vtm-android')
		implementation project(':vtm-extras')
		implementation project(':vtm-jts')
		implementation project(':vtm-microg-theme')

		compile 'org.conscrypt:conscrypt-android:2.0.0'
		implementation project(':play-services-maps-core-vtm')
		}

		def execResult(...args) {
		@@ -79,14 +82,11 @@ android {
		sourceSets {
		main {
		java.srcDirs += 'src/main/protos-java'
		file("${rootDir}/vtm-android/natives").eachDir() { dir ->
		jniLibs.srcDirs += "${dir.path}/lib"
		}
		}
		}

		lintOptions {
		disable 'MissingTranslation', 'InvalidPackage', 'BatteryLife', 'ImpliedQuantity', 'MissingQuantity'
		disable 'MissingTranslation', 'InvalidPackage', 'BatteryLife', 'ImpliedQuantity', 'MissingQuantity', 'InvalidWakeLockTag'
		}

		buildTypes {