Merge branch 'microg/master' into merge-upstream (63e63ea6) · Commits · e / os / GmsCore

.gitignore

+1 −0

+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

+2 −3

Original line number	Diff line number	Diff line
		@@ -10,8 +10,7 @@ android:
		components:
		- tools
		- platform-tools
		- build-tools-27.0.3
		- build-tools-28.0.3
		- android-27
		- android-28
		- extra-android-m2repository
		before_install:
		- yes \| sdkmanager "platforms;android-27"

+1 −1

Original line number	Diff line number	Diff line
		@@ -9,7 +9,7 @@ microG GmsCore is a FLOSS (Free/Libre Open Source Software) framework to allow a

		License
		-------
		Copyright 2014-2016 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.

+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()