Merge pull request #3842 from Catrobat/release-0.9.75

Release 0.9.75

.gitignore

@@ -60,7 +60,6 @@ __pycache__
 
 #api-keys
 catroid/google-services.json
-catroid/fabric.properties
 
 #Crowdin folder
 crowdin/

Jenkinsfile

@@ -1,12 +1,23 @@
 #!groovy
 
 class DockerParameters {
- def image = 'catrobat/catrobat-android'
- def imageLabel = 'stable'
+ def fileName = 'Dockerfile.jenkins'
+
+ // 'docker build' would normally copy the whole build-dir to the container, changing the
+ // docker build directory avoids that overhead
+ def dir = 'docker'
+
+ // Pass the uid and the gid of the current user (jenkins-user) to the Dockerfile, so a
+ // corresponding user can be added. This is needed to provide the jenkins user inside
+ // the container for the ssh-agent to work.
+ // Another way would be to simply map the passwd file, but would spoil additional information
+ // Also hand in the group id of kvm to allow using /dev/kvm.
+ def buildArgs = '--build-arg USER_ID=$(id -u) --build-arg GROUP_ID=$(id -g) --build-arg KVM_GROUP_ID=$(getent group kvm | cut -d: -f3)'
+
  def args = '--device /dev/kvm:/dev/kvm -v /var/local/container_shared/gradle_cache/$EXECUTOR_NUMBER:/home/user/.gradle -m=14G'
  def label = 'LimitedEmulator'
 }
-
+ 
 def d = new DockerParameters()
 
 def junitAndCoverage(String jacocoReportDir, String jacocoReportXml, String coverageName) {
@@ -77,11 +88,12 @@ pipeline {
  parallel {
  stage('1') {
  agent {
- docker {
- image useDockerLabelParameter(d.image, d.imageLabel)
+ dockerfile {
+ filename d.fileName
+ dir d.dir
+ additionalBuildArgs d.buildArgs
  args d.args
  label useDebugLabelParameter(d.label)
- alwaysPull true
  }
  }
 
@@ -222,18 +234,19 @@ pipeline {
 
  stage('2') {
  agent {
- docker {
- image useDockerLabelParameter(d.image, d.imageLabel)
+ dockerfile {
+ filename d.fileName
+ dir d.dir
+ additionalBuildArgs d.buildArgs
  args d.args
  label useDebugLabelParameter(d.label)
- alwaysPull true
  }
  }
 
  stages {
  stage('Pull Request Suite') {
  steps {
- catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {
+ catchError(buildResult: 'FAILURE' ,stageResult: 'FAILURE') {
  sh '''./gradlew copyAndroidNatives -PenableCoverage -PlogcatFile=pull_request_suite_logcat.txt -Pemulator=android28 \
  startEmulator createCatroidDebugAndroidTestCoverageReport \
  -Pandroid.testInstrumentationRunnerArguments.class=org.catrobat.catroid.testsuites.UiEspressoPullRequestTriggerSuite'''
@@ -253,12 +266,6 @@ pipeline {
  }
 
  post {
- always {
- node('master') {
- unstash 'logParserRules'
- step([$class: 'LogParserPublisher', failBuildOnError: true, projectRulePath: 'buildScripts/log_parser_rules', unstableOnWarning: true, useProjectRule: true])
- }
- }
  changed {
  node('master') {
  notifyChat()

Jenkinsfile.baseDocker

@@ -10,13 +10,7 @@ pipeline {
  DOCKER_DIR = 'docker'
  DOCKER_REPO = "catrobat"
  }
-
- parameters {
- booleanParam name: 'TAG_STABLE', defaultValue: false, description: 'When selected image will be tagged stable'
- booleanParam name: 'TAG_TESTING', defaultValue: true, description: 'When selected image will be tagged testing'
- string name: 'IMAGE_NAME', defaultValue: 'catrobat-android', description: 'Name for docker image to build'
- }
-
+
  options {
  timeout(time: 2, unit: 'HOURS')
  timestamps()

Jenkinsfile.releaseAPK

@@ -37,9 +37,6 @@ pipeline {
  -PsigningKeystorePassword=$signingKeystorePassword \
  -PsigningKeyAlias=$signingKeyAlias \
  -PsigningKeyPassword=$signingKeyPassword \
- -PfirebaseApiKey=$firebaseApiKey \
- -PfabricApiKey=$fabricApiKey \
- -PfabricApiSecret=$fabricApiSecret
  '''
  } else if (env.flavor == 'Playground') {
  sh '''
@@ -49,9 +46,6 @@ pipeline {
  -PsigningKeystorePassword=$signingKeystorePassword \
  -PsigningKeyAlias=$signingKeyAlias \
  -PsigningKeyPassword=$signingKeyPassword \
- -PfirebaseApiKey=$firebaseApiKey \
- -PfabricApiKey=$fabricApiKey \
- -PfabricApiSecret=$fabricApiSecret \
  -Pplayground=true
  '''
  } else {
@@ -62,9 +56,6 @@ pipeline {
  -PsigningKeystorePassword=$signingKeystorePassword \
  -PsigningKeyAlias=$signingKeyAlias \
  -PsigningKeyPassword=$signingKeyPassword \
- -PfirebaseApiKey=$firebaseApiKey \
- -PfabricApiKey=$fabricApiKey \
- -PfabricApiSecret=$fabricApiSecret
  '''
  }
  }

README.md

@@ -1,15 +1,15 @@
 # Catroid #
 
-Catroid, also known as **Pocket Code**, is an on-device visual programming system for Android devices.
+**Catroid** is a visual coding IDE and interpreter for Android for the Catrobat programming language.
 
 **Catrobat** is a visual programming language and a set of creativity tools for smartphones. 
-Catrobat programs can be written by using Catrobat's Android and iOS apps.
+Catrobat projects can be created using Catrobat's Android apps available on [Google Play](https://catrob.at/gp) and iPhone apps available on [Apple's app store](https://catrob.at/ca).
 
-For more information [oriented towards developers], check out our [developers page](https://developer.catrobat.org/).
+For more information oriented towards developers, check out our [developers page](https://developer.catrobat.org/).
 
 # Issues #
 
-For reporting issues use our [JIRA Bugtracking System](https://jira.catrob.at/secure/CreateIssue.jspa?pid=10402&issuetype=1). Before that, please browse our currently open issues [here](https://jira.catrob.at/secure/IssueNavigator.jspa?reset=true&jqlQuery=project+%3D+CAT+AND+resolution+%3D+Unresolved+ORDER+BY+priority+DESC%2C+key+DESC&mode=hide).
+For reporting issues use our [JIRA Bugtracking System](https://jira.catrob.at/secure/CreateIssue.jspa?pid=11800&issuetype=1). Before that, please browse our currently open issues [here](https://jira.catrob.at/secure/IssueNavigator.jspa?reset=true&jqlQuery=project+%3D+CATROID+AND+resolution+%3D+Unresolved+ORDER+BY+priority+DESC%2C+key+DESC&mode=hide).
 
 
 # Contributing #
@@ -27,12 +27,9 @@ Also make sure to read our guidelines for [creating a pull request](https://gith
 # Resources and links #
 * [Google Play Store Download](https://catrob.at/gp)
 * [Community website with sample programs](https://share.catrob.at/)
-* [Installation Instructions](https://github.com/Catrobat/Catroid/wiki/Installation-Instructions)
-* [Frequently Asked Questions](https://github.com/Catrobat/Catroid/wiki/Frequently-Asked-Questions)
-* [Credits](https://developer.catrobat.org/credits)
+* [Frequently Asked Questions](https://github.com/Catrobat/Catroid/wiki/Frequently-Asked-Questions-(Developers))
+* [Credits](https://catrob.at/credits)
 * [Statistics on OpenHub](https://www.openhub.net/p/catrobat/)
-* [Twitter](https://twitter.com/Catroid)
-* [Google+](https://plus.google.com/u/0/+CatrobatOrgAdmin/posts)
 * [Our Google group](https://groups.google.com/forum/?fromgroups#!forum/catrobat)
 
 # License #