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

Commit 3df3d57d authored by Sayantan Roychowdhury's avatar Sayantan Roychowdhury
Browse files

update version to 2.5.2 for 1.12-beta

parent 3a77c3ca

.gitlab-ci.yml

+1 −1
Original line number Original line Diff line number Diff line
@@ -167,7 +167,7 @@ pushToPrebuilt: 
    - sed -i "6s/.*/LOCAL_SRC_FILES := ${NEW_APK_NAME}/" Apps/Android.mk 

    - sed -i "6s/.*/LOCAL_SRC_FILES := ${NEW_APK_NAME}/" Apps/Android.mk 

    - git add Apps

    - git add Apps

    - git status

    - git status

    - git commit -m "Apps Lounge - ${NEW_APK_VERSION}, ${CI_COMMIT_TAG}" -m "From ${CI_COMMIT_SHA}, pipeline ${CI_PIPELINE_ID}"

    - git commit -m "App Lounge - ${NEW_APK_VERSION}, ${CI_COMMIT_TAG}" -m "From ${CI_COMMIT_SHA}, pipeline ${CI_PIPELINE_ID}"

    - git push

    - git push

    # Sometimes a single push doesn't do all the job, so we have to push twice

    # Sometimes a single push doesn't do all the job, so we have to push twice

    - git push 
    - git push 
 No newline at end of file

app/build.gradle

+2 −2
Original line number Original line Diff line number Diff line
@@ -11,7 +11,7 @@ plugins { 




def versionMajor = 2

def versionMajor = 2

def versionMinor = 5

def versionMinor = 5

def versionPatch = 1

def versionPatch = 2





def getGitHash = { ->

def getGitHash = { ->

    def stdOut = new ByteArrayOutputStream()

    def stdOut = new ByteArrayOutputStream()
@@ -150,7 +150,7 @@ dependencies { 
    // TODO: Add splitinstall-lib to a repo https://gitlab.e.foundation/e/os/backlog/-/issues/628

    // TODO: Add splitinstall-lib to a repo https://gitlab.e.foundation/e/os/backlog/-/issues/628

    api files('libs/splitinstall-lib.jar')

    api files('libs/splitinstall-lib.jar')





    implementation 'foundation.e.lib:telemetry:0.0.7-alpha'

    implementation 'foundation.e.lib:telemetry:0.0.8-alpha'





    implementation 'foundation.e:gplayapi:3.0.1'

    implementation 'foundation.e:gplayapi:3.0.1'

    implementation 'androidx.core:core-ktx:1.9.0'

    implementation 'androidx.core:core-ktx:1.9.0'

app/src/main/java/foundation/e/apps/updates/manager/UpdatesManagerImpl.kt

+6 −6
Original line number Original line Diff line number Diff line
@@ -34,8 +34,8 @@ import foundation.e.apps.utils.enums.ResultStatus 
import foundation.e.apps.utils.enums.Status

import foundation.e.apps.utils.enums.Status

import foundation.e.apps.utils.enums.isUnFiltered

import foundation.e.apps.utils.enums.isUnFiltered

import foundation.e.apps.utils.modules.PreferenceManagerModule

import foundation.e.apps.utils.modules.PreferenceManagerModule

import javax.inject.Inject

import timber.log.Timber

import timber.log.Timber

import javax.inject.Inject





class UpdatesManagerImpl @Inject constructor(

class UpdatesManagerImpl @Inject constructor(

    @ApplicationContext private val context: Context,

    @ApplicationContext private val context: Context,
@@ -90,7 +90,8 @@ class UpdatesManagerImpl @Inject constructor( 




        // Get GPlay app updates

        // Get GPlay app updates

        if (getApplicationCategoryPreference().contains(APP_TYPE_ANY) &&

        if (getApplicationCategoryPreference().contains(APP_TYPE_ANY) &&

            gPlayInstalledApps.isNotEmpty()) {

            gPlayInstalledApps.isNotEmpty()

        ) {





            status = getUpdatesFromApi({

            status = getUpdatesFromApi({

                fusedAPIRepository.getApplicationDetails(

                fusedAPIRepository.getApplicationDetails(
@@ -239,7 +240,7 @@ class UpdatesManagerImpl @Inject constructor( 




        Timber.i(

        Timber.i(

            "Signature calculated for : ${cleanApkFusedApp.package_name}, " +

            "Signature calculated for : ${cleanApkFusedApp.package_name}, " +

                    "signature version: ${installedVersionSignature}, " +

                "signature version: $installedVersionSignature, " +

                "is sig blank: ${pgpSignature.isBlank()}"

                "is sig blank: ${pgpSignature.isBlank()}"

        )

        )
@@ -301,7 +302,6 @@ class UpdatesManagerImpl @Inject constructor( 
            return ""

            return ""

        }

        }







        // Received list has build info of the latest version at the bottom.

        // Received list has build info of the latest version at the bottom.

        // We want it at the top.

        // We want it at the top.

        val builds = fdroidRepository.getBuildVersionInfo(packageName)?.asReversed() ?: return ""

        val builds = fdroidRepository.getBuildVersionInfo(packageName)?.asReversed() ?: return ""

app/src/main/java/foundation/e/apps/api/database/AppDatabase.kt

+1 −1

File changed.

Contains only whitespace changes.

app/src/main/java/foundation/e/apps/api/fdroid/models/BuildInfo.kt

+1 −1

File changed.

Contains only whitespace changes.

app/src/main/java/foundation/e/apps/login/AuthDataValidator.kt

+1 −1

File changed.

Contains only whitespace changes.

app/src/main/java/foundation/e/apps/login/LoginSourceGPlay.kt

+13 −13

File changed.

Contains only whitespace changes.