diff --git a/Jenkinsfile b/Jenkinsfile index f70d9c6..46fc6a5 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -65,14 +65,16 @@ lazyConfig( name: 'dummy-and', env: [ - RELEASE: true, - JAVA_HOME: '/usr/java/latest', - ANDROID_HOME: '/opt/android/sdk', - GRADLE_USER_HOME: '/opt/android/gradle', - GRADLE_OPTS: '-XX:MaxMetaspaceSize=256m -Xmx1792m -Dfile.encoding=UTF-8 -Duser.country=US -Duser.language=en -Duser.variant -Dme.jenkins -Dorg.gradle.daemon=false -Dkotlin.compiler.execution.strategy=in-process', - GOOGLE_API_CID: 'dappre-google-api', - FIREBASE_API_CID: 'dappre-firebase-api', - FIREBASE_GROUPS: 'dev', + RELEASE: true, + JAVA_HOME: '/usr/java/latest', + ANDROID_HOME: '/opt/android/sdk', + GRADLE_USER_HOME: '/opt/android/gradle', + GRADLE_OPTS: '-XX:MaxMetaspaceSize=256m -Xmx1792m -Dfile.encoding=UTF-8 -Duser.country=US -Duser.language=en -Duser.variant -Dme.jenkins -Dorg.gradle.daemon=false -Dkotlin.compiler.execution.strategy=in-process', + ANDROID_KEYALIAS: 'signing', + ANDROID_KEYSTORE_CID: 'dummy-android', + GOOGLE_API_CID: 'dappre-google-api', + FIREBASE_API_CID: 'dappre-firebase-api', + FIREBASE_GROUPS: 'dev', ], noIndex: '(.+_.+|production)', // Avoid automatic indexing for release and private branches xmppTargets: 'noise@conference.qiy.nl', diff --git a/README.md b/README.md index a6c41c6..5ea3ee2 100644 --- a/README.md +++ b/README.md @@ -1,18 +1,22 @@ # Dummy Android -## Requirements +## Docker + +This project relies on Docker to allow development using the same environment as the CI server (Jenkins). + +### Requirements - Android SDK - Docker (18.09.1+) - Docker Composer (1.21.0+) -## Configuration +### Configuration By default, Android SDK is expected under `~/android/sdk`. It is possible to adapt this path in `docker-compose.yml`. But it may also be specified in your `local.properties`! -## Usage +### Usage The following command should build (if required) and start a shell session inside the container: @@ -33,3 +37,16 @@ bundle update fastlane bundle update ``` + +## Jenkins + +The project is designed to be build from a Jenkins server, which will provide the above requirements. + +### Dependencies + +- [Jenkins Lazy Lib](https://github.com/digital-me/jenkins-lib-lazy) +- [Jenkins Custom Lib]() + +### Usage + +Like all projects using lazyLib, each build can be altered with LAZY_ENV parameter. diff --git a/fastlane/metadata/android/en-US/changelogs/latest.txt b/fastlane/metadata/android/en-US/changelogs/latest.txt index 600e25c..ed3b331 100644 --- a/fastlane/metadata/android/en-US/changelogs/latest.txt +++ b/fastlane/metadata/android/en-US/changelogs/latest.txt @@ -1,4 +1,3 @@ -- Nothing visible -- Backport latest Gradle config from Dappre -- Improves PL with better validation -- Support Firebase App Distribution +- Switch to new signing key - reinstall needed +- Nothing else visible +- Update base image to CentOS 7.8 diff --git a/fastlane/metadata/android/nl-NL/changelogs/latest.txt b/fastlane/metadata/android/nl-NL/changelogs/latest.txt index 2ebc369..0274f99 100644 --- a/fastlane/metadata/android/nl-NL/changelogs/latest.txt +++ b/fastlane/metadata/android/nl-NL/changelogs/latest.txt @@ -1,3 +1,3 @@ -- Niets zichtbaar -- Backports van Dappre -- Verbeterd PL \ No newline at end of file +- Wisselen nieuwe specifiek sleutel - reinstall nodig +- Niets anders zichtbaar +- Bijwerken base image met CentOS 7.8 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 9e1d929..bcf7aa8 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip diff --git a/lazyDir/centos7.Dockerfile b/lazyDir/centos7.Dockerfile index 66da721..da1ff9d 100644 --- a/lazyDir/centos7.Dockerfile +++ b/lazyDir/centos7.Dockerfile @@ -18,7 +18,7 @@ # # Pull base image from official repo -FROM centos:centos7.7.1908 +FROM centos:centos7.8.2003 # Import local GPG keys and enable epel repo RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7 && \