Merge branch 'upstream/master' into 3161-merge-v0.2.19.211515 (5b798b01) · Commits · e / os / GmsCore

README.md

+1 −1

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

	License		License
	-------		-------
	Copyright 2013-2020 microG Project Team		Copyright 2013-2021 microG Project Team

	Licensed under the Apache License, Version 2.0 (the "License");		Licensed under the Apache License, Version 2.0 (the "License");
	you may not use this file except in compliance with the License.		you may not use this file except in compliance with the License.

artwork/ic_recaptcha.svg

0 → 100644

+91 −0

Original line number	Original line	Diff line number	Diff line
			<?xml version="1.0" encoding="UTF-8" standalone="no"?>
			<!--
			~ SPDX-FileCopyrightText: 2021, microG Project Team
			~ SPDX-License-Identifier: Apache-2.0
			-->
			<svg
			xmlns:dc="http://purl.org/dc/elements/1.1/"
			xmlns:cc="http://creativecommons.org/ns#"
			xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
			xmlns:svg="http://www.w3.org/2000/svg"
			xmlns="http://www.w3.org/2000/svg"
			xmlns:xlink="http://www.w3.org/1999/xlink"
			width="48mm"
			height="48mm"
			viewBox="0 0 48 48"
			version="1.1"
			id="svg8">
			<defs
			id="defs2">
			<linearGradient
			id="linearGradient883"
			x1="52.914062"
			y1="90.708984"
			x2="52.914062"
			y2="78.548767"
			gradientUnits="userSpaceOnUse">
			<stop
			style="stop-color:#1e88e5;stop-opacity:1"
			offset="0"
			id="stop877" />
			<stop
			style="stop-color:#2196f3;stop-opacity:1"
			offset="1"
			id="stop879" />
			</linearGradient>
			<linearGradient
			id="linearGradient887"
			gradientUnits="userSpaceOnUse"
			x1="52.914062"
			y1="90.708984"
			x2="52.914062"
			y2="78.548767"
			gradientTransform="matrix(0,0.26458333,-0.26458333,0,48.00017,-8.2278639e-8)">
			<stop
			style="stop-color:#3949ab;stop-opacity:1"
			offset="0"
			id="stop904" />
			<stop
			style="stop-color:#3f51b5;stop-opacity:1"
			offset="1"
			id="stop906" />
			</linearGradient>
			<linearGradient
			id="linearGradient918"
			x1="24.000086"
			y1="1.9998779"
			x2="46.000294"
			y2="24.000086"
			gradientUnits="userSpaceOnUse">
			<stop
			style="stop-color:#ffffff;stop-opacity:0.09411765"
			offset="0"
			id="stop912" />
			<stop
			style="stop-color:#ffffff;stop-opacity:0"
			offset="1"
			id="stop914" />
			</linearGradient>
			</defs>
			<g
			id="layer1">
			<path
			id="circle855"
			style="fill:#bdbdbd;fill-opacity:1;stroke:#000000;stroke-width:0"
			d="M 7.5585938,90.708984 V 153.07227 L 22.445312,138.18555 a 83.149605,83.149605 0 0 0 36.44336,29.34375 83.149605,83.149605 0 0 0 90.615238,-18.02539 L 117.43359,117.43359 A 37.795276,37.795276 0 0 1 90.708984,128.50391 37.795276,37.795276 0 0 1 55.695312,104.93555 L 69.921875,90.708984 H 52.914062 Z"
			transform="scale(0.26458333)" />
			<path
			id="circle857"
			style="fill:url(#linearGradient883);fill-opacity:1;stroke:#000000;stroke-width:0"
			d="M 28.345703,7.5585938 43.232422,22.445312 A 83.149605,83.149605 0 0 0 7.5585938,90.708984 H 52.914062 A 37.795276,37.795276 0 0 1 76.482422,55.695312 L 90.708984,69.921875 V 52.914062 7.5585938 h -0.257812 z"
			transform="scale(0.26458333)" />
			<path
			id="path885"
			style="fill:url(#linearGradient887);fill-opacity:1;stroke:#000000;stroke-width:0"
			d="M 46.000292,7.4997999 42.061515,11.438578 A 21.999999,21.999999 0 0 0 24.000085,1.9998779 V 14.000179 a 10,10 0 0 1 9.264034,6.235795 l -3.764112,3.764111 h 4.499984 12.000301 v -0.06821 z" />
			<path
			id="path910"
			style="fill:url(#linearGradient918);fill-opacity:1;stroke:#000000;stroke-width:0"
			d="M 46.000292,7.4997999 42.061515,11.438578 C 37.949082,5.5254753 31.202646,1.9998641 24.000085,1.9998779 L 46.000292,24.000085 v -0.06821 z" />
			</g>
			</svg>

build.gradle

+10 −9

Original line number	Original line	Diff line number	Diff line
	@@ -9,28 +9,29 @@ buildscript {
	ext.safeParcelVersion = '1.7.0'		ext.safeParcelVersion = '1.7.0'
	ext.wearableVersion = '0.1.1'		ext.wearableVersion = '0.1.1'

	ext.kotlinVersion = '1.4.10'		ext.kotlinVersion = '1.4.32'
	ext.coroutineVersion = '1.3.7'		ext.coroutineVersion = '1.3.8'

	ext.annotationVersion = '1.1.0'		ext.annotationVersion = '1.2.0'
	ext.appcompatVersion = '1.2.0'		ext.appcompatVersion = '1.2.0'
	ext.coreVersion = '1.3.0'		ext.coreVersion = '1.3.0'
	ext.fragmentVersion = '1.2.5'		ext.fragmentVersion = '1.2.5'
	ext.lifecycleVersion = '2.2.0'		ext.lifecycleVersion = '2.3.1'
	ext.mediarouterVersion = '1.2.0'		ext.mediarouterVersion = '1.2.2'
	ext.multidexVersion = '2.0.1'		ext.multidexVersion = '2.0.1'
	ext.navigationVersion = '2.3.1'		ext.navigationVersion = '2.3.5'
	ext.preferenceVersion = '1.1.1'		ext.preferenceVersion = '1.1.1'
	ext.recyclerviewVersion = '1.1.0'		ext.recyclerviewVersion = '1.1.0'
			ext.webkitVersion = '1.4.0'

	ext.supportLibraryVersion = '28.0.0'		ext.supportLibraryVersion = '28.0.0'
	ext.slf4jVersion = '1.7.25'		ext.slf4jVersion = '1.7.25'
	ext.volleyVersion = '1.1.1'		ext.volleyVersion = '1.2.0'
	ext.wireVersion = '3.2.2'		ext.wireVersion = '3.2.2'

	ext.androidBuildGradleVersion = '4.1.0'		ext.androidBuildGradleVersion = '4.1.0'

	ext.androidBuildVersionTools = '29.0.3'		ext.androidBuildVersionTools = '30.0.2'

	ext.androidMinSdk = 14		ext.androidMinSdk = 14
	ext.androidTargetSdk = 29		ext.androidTargetSdk = 29
	@@ -57,7 +58,7 @@ def execResult(...args) {
	return stdout.toString().trim()		return stdout.toString().trim()
	}		}

	def gmsVersion = "20.47.14"		def gmsVersion = "21.15.15"
	def gmsVersionCode = Integer.parseInt(gmsVersion.replaceAll('\\.', ''))		def gmsVersionCode = Integer.parseInt(gmsVersion.replaceAll('\\.', ''))
	def gitVersionBase = execResult('git', 'describe', '--tags', '--abbrev=0', '--match=v[0-9]*').substring(1)		def gitVersionBase = execResult('git', 'describe', '--tags', '--abbrev=0', '--match=v[0-9]*').substring(1)
	def gitCommitCount = Integer.parseInt(execResult('git', 'rev-list', '--count', "v$gitVersionBase..HEAD"))		def gitCommitCount = Integer.parseInt(execResult('git', 'rev-list', '--count', "v$gitVersionBase..HEAD"))

firebase-auth-core/build.gradle

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -5,7 +5,6 @@

	apply plugin: 'com.android.library'		apply plugin: 'com.android.library'
	apply plugin: 'kotlin-android'		apply plugin: 'kotlin-android'
	apply plugin: 'kotlin-android-extensions'

	dependencies {		dependencies {
	api project(':firebase-auth-api')		api project(':firebase-auth-api')

play-services-api/src/main/aidl/com/google/android/gms/facs/cache/FacsCacheCallOptions.aidl

0 → 100644

+3 −0

Original line number	Original line	Diff line number	Diff line
			package com.google.android.gms.facs.cache;

			parcelable FacsCacheCallOptions;