Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit f5ad796b authored by Marvin W.'s avatar Marvin W. 🐿️
Browse files

Location: Entire rewrite of the location subsystem 

No modules anymore, they became unreliable in recent Android versions due to
"energy savings".
parent 956e2ca5

build.gradle

+5 −6
Original line number Diff line number Diff line
@@ -5,18 +5,17 @@ 


buildscript {

    ext.cronetVersion = '102.5005.125'

    ext.nlpVersion = '2.0-alpha10'

    ext.safeParcelVersion = '1.7.0'

    ext.safeParcelVersion = '1.7.1'

    ext.wearableVersion = '0.1.1'



    ext.kotlinVersion = '1.7.10'

    ext.coroutineVersion = '1.6.4'



    ext.annotationVersion = '1.5.0'

    ext.appcompatVersion = '1.4.2'

    ext.appcompatVersion = '1.6.1'

    ext.biometricVersion = '1.1.0'

    ext.coreVersion = '1.8.0'

    ext.fragmentVersion = '1.5.1'

    ext.coreVersion = '1.9.0'

    ext.fragmentVersion = '1.5.5'

    ext.lifecycleVersion = '2.5.1'

    ext.loaderVersion = '1.1.0'

    ext.mediarouterVersion = '1.3.1'
@@ -36,7 +35,7 @@ buildscript { 


    ext.androidMinSdk = 14

    ext.androidTargetSdk = 29

    ext.androidCompileSdk = 31

    ext.androidCompileSdk = 33



    repositories {

        mavenCentral()

play-services-basement/src/main/java/com/google/android/gms/common/internal/GetServiceRequest.java

+3 −2
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ import java.util.Arrays; 


public class GetServiceRequest extends AutoSafeParcelable {

    @Field(1)

    private int versionCode = 4;

    private int versionCode = 6;

    @Field(2)

    public final int serviceId;

    @Field(3)
@@ -48,6 +48,7 @@ public class GetServiceRequest extends AutoSafeParcelable { 
    @Field(8)

    public Account account;

    @Field(9)

    @Deprecated

    private long field9;

    @Field(10)

    public Feature[] defaultFeatures;
@@ -60,7 +61,7 @@ public class GetServiceRequest extends AutoSafeParcelable { 
    @Field(14)

    private boolean field14;

    @Field(15)

    private String field15;

    private String attributionTag;



    private GetServiceRequest() {

        serviceId = -1;

play-services-basement/src/main/java/org/microg/gms/common/Hide.java

0 → 100644
+19 −0
Original line number Diff line number Diff line 
/*

 * SPDX-FileCopyrightText: 2023 microG Project Team

 * SPDX-License-Identifier: Apache-2.0

 */



package org.microg.gms.common;



import java.lang.annotation.ElementType;

import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;

import java.lang.annotation.Target;



/**

 * Hide the class, method or field from the public API.

 */

@Retention(RetentionPolicy.SOURCE)

@Target({ElementType.TYPE, ElementType.FIELD, ElementType.METHOD, ElementType.CONSTRUCTOR})

public @interface Hide {

}

play-services-basement/src/main/java/org/microg/gms/common/PublicApi.java

+2 −0
Original line number Diff line number Diff line
@@ -43,6 +43,8 @@ public @interface PublicApi { 
     * marked as public api.

     *

     * @return true if the method or field is not part of the public api

     * @deprecated use {@link Hide} instead

     */

    @Deprecated

    boolean exclude() default false;

}

play-services-core/build.gradle

+0 −13
Original line number Diff line number Diff line
@@ -54,19 +54,6 @@ dependencies { 
    implementation project(':play-services-safetynet')

    implementation project(':play-services-tasks-ktx')



    runtimeOnly("org.microg.nlp:geocode-v1:$nlpVersion") {

        exclude group: 'org.microg', module: 'safe-parcel'

    }

    runtimeOnly("org.microg.nlp:location-v2:$nlpVersion") {

        exclude group: 'org.microg', module: 'safe-parcel'

    }

    runtimeOnly("org.microg.nlp:location-v3:$nlpVersion") {

        exclude group: 'org.microg', module: 'safe-parcel'

    }

    implementation("org.microg.nlp:ui:$nlpVersion") {

        exclude group: 'org.microg', module: 'safe-parcel'

    }



    withMapboxImplementation project(':play-services-maps-core-mapbox')

    withVtmImplementation project(':play-services-maps-core-vtm')