Merge remote-tracking branch 'upstream/master' (46b52a09) · Commits · e / os / GmsCore

.github/workflows/build.yml

+5 −0

Original line number	Diff line number	Diff line
		@@ -7,6 +7,11 @@ jobs:
		- uses: actions/checkout@v2
		with:
		fetch-depth: 0
		- uses: actions/setup-java@v3
		with:
		distribution: 'temurin'
		java-version: '17'
		cache: 'gradle'
		- run: ./gradlew --no-daemon build
		env:
		TERM: dumb

build.gradle

+5 −16

Original line number	Diff line number	Diff line
		@@ -5,10 +5,9 @@

		buildscript {
		ext.cronetVersion = '102.5005.125'
		ext.safeParcelVersion = '1.7.1'
		ext.wearableVersion = '0.1.1'

		ext.kotlinVersion = '1.7.10'
		ext.kotlinVersion = '1.7.22'
		ext.coroutineVersion = '1.6.4'

		ext.annotationVersion = '1.5.0'
		@@ -27,11 +26,11 @@ buildscript {

		ext.slf4jVersion = '1.7.36'
		ext.volleyVersion = '1.2.1'
		ext.wireVersion = '4.4.1'
		ext.wireVersion = '4.8.0'

		ext.androidBuildGradleVersion = '7.2.1'
		ext.androidBuildGradleVersion = '8.0.2'

		ext.androidBuildVersionTools = '33.0.0'
		ext.androidBuildVersionTools = '33.0.1'

		ext.androidMinSdk = 21
		ext.androidTargetSdk = 29
		@@ -55,7 +54,6 @@ buildscript {
		classpath "com.android.tools.build:gradle:$androidBuildGradleVersion"
		classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
		classpath "com.squareup.wire:wire-gradle-plugin:$wireVersion"
		classpath "com.github.kezong:fat-aar:1.3.8"
		}
		}

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

		def gmsVersion = "23.16.57"
		def gmsVersion = "23.30.13"
		def gmsVersionCode = Integer.parseInt(gmsVersion.replaceAll('\\.', ''))
		def gitVersionBase = execResult('git', 'describe', '--tags', '--abbrev=0', '--match=v[0-9]*').trim().substring(1)
		def gitCommitCount = Integer.parseInt(execResult('git', 'rev-list', '--count', "v$gitVersionBase..HEAD").trim())
		@@ -110,13 +108,4 @@ subprojects {
		google()
		maven { url 'https://gitlab.e.foundation/api/v4/groups/9/-/packages/maven'}
		}
		afterEvaluate {
		// Temporary hack for Android Studio
		if (project.plugins.hasPlugin('com.android.base')) {
		dependencies {
		compileOnly "org.microg:safe-parcel:$safeParcelVersion"
		testCompileOnly "org.microg:safe-parcel:$safeParcelVersion"
		}
		}
		}
		}

firebase-auth/build.gradle

+5 −0

Original line number	Diff line number	Diff line
		@@ -6,9 +6,14 @@
		apply plugin: 'com.android.library'

		android {
		namespace 'com.google.firebase.auth'
		compileSdkVersion androidCompileSdk
		buildToolsVersion "$androidBuildVersionTools"

		buildFeatures {
		aidl = true
		}

		defaultConfig {
		versionName version
		minSdkVersion androidMinSdk

firebase-auth/core/build.gradle

+5 −0

Original line number	Diff line number	Diff line
		@@ -24,6 +24,8 @@ dependencies {
		}

		android {
		namespace "org.microg.gms.firebase.auth.core"

		compileSdkVersion androidCompileSdk
		buildToolsVersion "$androidBuildVersionTools"

		@@ -42,4 +44,7 @@ android {
		targetCompatibility = 1.8
		}

		kotlinOptions {
		jvmTarget = 1.8
		}
		}

firebase-auth/core/src/main/AndroidManifest.xml

+1 −2

Original line number	Diff line number	Diff line
		@@ -3,8 +3,7 @@
		~ SPDX-FileCopyrightText: 2020, microG Project Team
		~ SPDX-License-Identifier: Apache-2.0
		-->
		<manifest xmlns:android="http://schemas.android.com/apk/res/android"
		package="org.microg.gms.firebase.auth.core">
		<manifest xmlns:android="http://schemas.android.com/apk/res/android">

		<uses-permission android:name="android.permission.INTERNET" />
		<uses-permission android:name="android.permission.RECEIVE_SMS" />