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

Unverified Commit fb7658cf authored by Ricki Hirner's avatar Ricki Hirner
Browse files

AboutLibraries: explicitly export library definitions at release (#485) 

Export library definitions for release
parent 3eb8eba7

.github/workflows/release.yml

+6 −2
Original line number Diff line number Diff line
@@ -35,10 +35,14 @@ jobs: 


      - name: Prepare keystore

        run: echo ${{ secrets.android_keystore_base64 }} | base64 -d >$GITHUB_WORKSPACE/keystore.jks



      - name: Export library definitions

        run: ./gradlew --no-build-cache --no-configuration-cache -PaboutLibraries.exportPath=src/main/res/raw/ app:exportLibraryDefinitions



      - name: Build signed package

        # --no-configuration-cache is only required for AboutLibraries (bitfireAT/davx5#263, mikepenz/AboutLibraries#857)

        # Remove it as soon as AboutLibraries is compatbile with the gradle configuration cache.

        run: ./gradlew --no-configuration-cache --no-daemon app:assembleRelease

        # Remove it as soon as AboutLibraries is compatible with the gradle configuration cache.

        run: ./gradlew app:assembleRelease

        env:

          ANDROID_KEYSTORE: ${{ github.workspace }}/keystore.jks

          ANDROID_KEYSTORE_PASSWORD: ${{ secrets.android_keystore_password }}

app/build.gradle

+6 −0
Original line number Diff line number Diff line
@@ -11,6 +11,12 @@ plugins { 
    id 'kotlin-kapt'     // remove as soon as Hilt supports KSP [https://issuetracker.google.com/179057202]

}



aboutLibraries {

    // This means that we have to generate the dependencies explicitly:

    // ./gradlew --no-configuration-cache --no-build-cache -PaboutLibraries.exportPath=src/main/res/raw/ app:exportLibraryDefinitions

    registerAndroidTasks = false

}



// Android configuration

android {

    compileSdk 34

app/src/main/kotlin/at/bitfire/davdroid/ui/AboutActivity.kt

+10 −2
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ import androidx.compose.foundation.pager.HorizontalPager 
import androidx.compose.foundation.pager.rememberPagerState

import androidx.compose.foundation.rememberScrollState

import androidx.compose.foundation.verticalScroll

import androidx.compose.material.Divider

import androidx.compose.material.Icon

import androidx.compose.material.IconButton

import androidx.compose.material.MaterialTheme
@@ -55,7 +54,9 @@ import at.bitfire.davdroid.R 
import at.bitfire.davdroid.log.Logger

import at.bitfire.davdroid.ui.widget.PixelBoxes

import com.google.accompanist.themeadapter.material.MdcTheme

import com.mikepenz.aboutlibraries.Libs

import com.mikepenz.aboutlibraries.ui.compose.LibrariesContainer

import com.mikepenz.aboutlibraries.util.withJson

import dagger.BindsOptionalOf

import dagger.Module

import dagger.hilt.InstallIn
@@ -163,7 +164,14 @@ class AboutActivity: AppCompatActivity() { 
                                    TranslatorsGallery(translations.value)

                                }



                                2 -> LibrariesContainer(Modifier.fillMaxSize())

                                2 -> LibrariesContainer(Modifier.fillMaxSize(),

                                    itemContentPadding = PaddingValues(horizontal = 8.dp, vertical = 8.dp),

                                    itemSpacing = 8.dp,

                                    librariesBlock = { ctx ->

                                        Libs.Builder()

                                            .withJson(ctx, R.raw.aboutlibraries)

                                            .build()

                                    })

                            }

                        }

                    }

app/src/main/res/raw/aboutlibraries.json

0 → 100644
+3 −0
Original line number Diff line number Diff line 
{"metadata":{"generated":"2023-12-03T12:08:52.214Z"},"libraries":[

  {"uniqueId":"com.example:sample","funding":[],"developers":[{"name":"Sample Developer"}],"artifactVersion":"1.0","description":"This list has to be updated at release build time by explicitly writing to R.raw.aboutlibraries.","name":"Sample Dependency","licenses":["Sample-License"]}

], "licenses":{}}