Merge branch 'merge-v0.2.14.204215' (bab1bbc3) · Commits · e / os / GmsCore

README.md

+1 −1

Original line number	Diff line number	Diff line
		<img src="http://i.imgur.com/hXY4lcC.png" height="42px" alt="microG" /> Services Core (GmsCore)
		=======
		[![Build Status](https://travis-ci.org/microg/android_packages_apps_GmsCore.svg?branch=master)](https://travis-ci.org/microg/android_packages_apps_GmsCore)
		[![Build Status](https://travis-ci.com/microg/GmsCore.svg?branch=master)](https://travis-ci.com/microg/GmsCore)

		microG GmsCore is a FLOSS (Free/Libre Open Source Software) framework to allow applications designed for Google Play Services to run on systems, where Play Services is not available.

+7 −7

Original line number	Diff line number	Diff line
		@@ -4,22 +4,22 @@
		*/

		buildscript {
		ext.nlpVersion = '2.0-alpha4'
		ext.nlpVersion = '2.0-alpha5'
		ext.remoteDroidGuardVersion = '0.1.2'
		ext.safeParcelVersion = '1.6.0'
		ext.wearableVersion = '0.1.1'

		ext.kotlinVersion = '1.3.72'
		ext.kotlinVersion = '1.4.10'
		ext.coroutineVersion = '1.3.7'

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

		@@ -28,7 +28,7 @@ buildscript {
		ext.volleyVersion = '1.1.1'
		ext.wireVersion = '3.2.2'

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

		ext.androidBuildVersionTools = '29.0.3'

		@@ -57,7 +57,7 @@ def execResult(...args) {
		return stdout.toString().trim()
		}

		def gmsVersion = "20.39.15"
		def gmsVersion = "20.42.15"
		def gmsVersionCode = Integer.parseInt(gmsVersion.replaceAll('\\.', ''))
		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"))

0 → 100644

+68 −0

Original line number	Diff line number	Diff line
		/*
		* SPDX-FileCopyrightText: 2020, microG Project Team
		* SPDX-License-Identifier: Apache-2.0
		*/

		task androidSourcesJar(type: Jar) {
		archiveClassifier.set("sources")
		from android.sourceSets.main.java.source
		}

		artifacts {
		archives androidSourcesJar
		}

		afterEvaluate {
		publishing {
		publications {
		release(MavenPublication) {
		pom {
		name = project.name
		description = project.description
		url = 'https://github.com/microg/GmsCore'
		licenses {
		license {
		name = 'The Apache Software License, Version 2.0'
		url = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
		}
		}
		developers {
		developer {
		id = 'microg'
		name = 'microG Team'
		}
		developer {
		id = 'mar-v-in'
		name = 'Marvin W.'
		}
		}
		scm {
		url = 'https://github.com/microg/GmsCore'
		connection = 'scm:git:https://github.com/microg/GmsCore.git'
		developerConnection = 'scm:git:ssh://github.com/microg/GmsCore.git'
		}
		}

		from components.release
		artifact androidSourcesJar
		}
		}
		if (project.hasProperty('sonatype.username')) {
		repositories {
		maven {
		name = 'sonatype'
		url = 'https://oss.sonatype.org/service/local/staging/deploy/maven2/'
		credentials {
		username project.getProperty('sonatype.username')
		password project.getProperty('sonatype.password')
		}
		}
		}
		}
		}
		if (project.hasProperty('signing.keyId')) {
		signing {
		sign publishing.publications
		}
		}
		}

0 → 100644

+80 −0

Original line number	Diff line number	Diff line
		/*
		* SPDX-FileCopyrightText: 2020, microG Project Team
		* SPDX-License-Identifier: Apache-2.0
		*/

		task javaSourcesJar(type: Jar) {
		archiveClassifier.set("sources")
		from sourceSets.main.allJava
		}

		javadoc {
		classpath = configurations.compileClasspath
		source = sourceSets.main.allJava
		}

		task javaJavadocsJar(type: Jar) {
		archiveClassifier.set("javadoc")
		from javadoc
		}

		artifacts {
		archives javaSourcesJar
		archives javaJavadocsJar
		}

		afterEvaluate {
		publishing {
		publications {
		release(MavenPublication) {
		pom {
		name = project.name
		description = project.description
		url = 'https://github.com/microg/GmsCore'
		licenses {
		license {
		name = 'The Apache Software License, Version 2.0'
		url = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
		}
		}
		developers {
		developer {
		id = 'microg'
		name = 'microG Team'
		}
		developer {
		id = 'mar-v-in'
		name = 'Marvin W.'
		}
		}
		scm {
		url = 'https://github.com/microg/GmsCore'
		connection = 'scm:git:https://github.com/microg/GmsCore.git'
		developerConnection = 'scm:git:ssh://github.com/microg/GmsCore.git'
		}
		}

		from components.java
		artifact javaSourcesJar
		artifact javaJavadocsJar
		}
		}
		if (project.hasProperty('sonatype.username')) {
		repositories {
		maven {
		name = 'sonatype'
		url = 'https://oss.sonatype.org/service/local/staging/deploy/maven2/'
		credentials {
		username project.getProperty('sonatype.username')
		password project.getProperty('sonatype.password')
		}
		}
		}
		}
		}
		if (project.hasProperty('signing.keyId')) {
		signing {
		sign publishing.publications
		}
		}
		}

+4 −1

Original line number	Diff line number	Diff line
		# SPDX-FileCopyrightText: 2015, microG Project Team
		# SPDX-License-Identifier: CC0-1.0

		distributionBase=GRADLE_USER_HOME
		distributionPath=wrapper/dists
		distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
		zipStoreBase=GRADLE_USER_HOME
		zipStorePath=wrapper/dists
		distributionUrl=https\://services.gradle.org/distributions/gradle-6.4-all.zip