diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 51503631100de567d1a13be1440fa64550304a6f..96c4fed2b8f7aace0cdf9a21e42ee362ee68fe5c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,11 +1,33 @@ +image: "registry.gitlab.e.foundation/e/os/docker-android-apps-cicd:latest" + stages: - - auto-merge-main + - build - update-from-upstream include: - - project: 'e/templates' - ref: master - file: '/gitlab-ci/.gitlab-ci-auto-merge-main.yml' - - project: 'e/templates' - ref: master - file: '/gitlab-ci/.gitlab-ci-import-updates-from-upstream.yml' + - project: "e/templates" + ref: main + file: "/.gitlab/gitlab-ci/gitlab-ci-import-updates-from-upstream.yml" + +main: + extends: .update-from-upstream + variables: + UPSTREAM_BRANCH: lineage-23.0 + LOCAL_BRANCH: main + +before_script: + - export GRADLE_USER_HOME=$(pwd)/.gradle + - chmod +x ./gradlew + +cache: + key: ${CI_PROJECT_ID} + paths: + - .gradle/ + +build: + stage: build + script: + - ./gradlew assemble + artifacts: + paths: + - build/outputs/apk diff --git a/build.gradle b/build.gradle index b63a2e2d174aa3f66309d4f3bc8cd7b3bacee15a..5297022a0b216464827bdf7427ddf2641d9fb96b 100644 --- a/build.gradle +++ b/build.gradle @@ -11,6 +11,27 @@ android { targetSdkVersion 34 } + signingConfigs { + testkey { + storeFile file("keystore/testkey.jks") + storePassword "testkey" + keyAlias "testkey" + keyPassword "testkey" + } + } + + buildTypes { + debug { + signingConfig = signingConfigs.testkey + } + release { + signingConfig = signingConfigs.testkey + minifyEnabled = true + shrinkResources = true + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard.flags' + } + } + sourceSets { main { res.srcDirs = ['res'] @@ -49,6 +70,7 @@ dependencies { implementation 'androidx.test:core:1.5.0' implementation 'androidx.test:rules:1.5.0' testImplementation 'junit:junit:4.13.2' + implementation 'foundation.e:elib:0.0.1-alpha11' } tasks.withType(JavaCompile) { diff --git a/keystore/testkey.jks b/keystore/testkey.jks new file mode 100644 index 0000000000000000000000000000000000000000..f8e2054d1569c252e29ec38ddf557234164c2534 Binary files /dev/null and b/keystore/testkey.jks differ diff --git a/res/layout/alarm_volume_preference.xml b/res/layout/alarm_volume_preference.xml index e8e969f2017b90179a5b20586ba33656d9a790c5..a872576719ac1653ff3a4d541655be63be4919a3 100644 --- a/res/layout/alarm_volume_preference.xml +++ b/res/layout/alarm_volume_preference.xml @@ -58,7 +58,7 @@ android:layout_weight="1" android:paddingStart="12dp" android:singleLine="true" - android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Subhead" + android:textAppearance="@style/TextAppearance.AppCompat.Subhead" android:textColor="?android:attr/textColorPrimary" android:ellipsize="marquee" android:fadingEdge="horizontal"/> diff --git a/settings.gradle b/settings.gradle index d51de7b81c3922d98721e87f112526eb8058844b..c18b8a02db0cf2cd0a181b0e97a7b321ab008d24 100644 --- a/settings.gradle +++ b/settings.gradle @@ -10,6 +10,7 @@ dependencyResolutionManagement { repositories { google() mavenCentral() + maven{ url 'https://gitlab.e.foundation/api/v4/groups/9/-/packages/maven'} } } rootProject.name = "DeskClock"