diff --git a/.gitignore b/.gitignore
index 97396c08c03..ee255a2aff1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -60,7 +60,6 @@ __pycache__
#api-keys
catroid/google-services.json
-catroid/fabric.properties
#Crowdin folder
crowdin/
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index c6558a4568c..612319a820f 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -8,9 +8,6 @@
-
-
-
@@ -73,9 +70,6 @@
-
-
-
@@ -100,7 +94,6 @@
-
diff --git a/CHANGELOG.md b/CHANGELOG.md
deleted file mode 100644
index 83015d74bc0..00000000000
--- a/CHANGELOG.md
+++ /dev/null
@@ -1,118 +0,0 @@
-Changelog
-=========
-
-version 0.9.9
------------------
-- new saving strategy: no corrupted projects anymore
-- performance improvements
- * broadcast/wait
-- general bugfixes
- * error messages from server
- * harmonize UI
- * special characters in project name
- * length of really short sounds
-
-version 0.9.8
------------------
-- bugfixes
-- remove unfinished translations
-
-version 0.9.7
------------------
-- fix crashes on Android 4.4 when importing images and sound
-- fixes a bug where some math functions didn't work correctly
-- open websites in-app
-- stage: fix broadcast behavior
-- stage: hiding objects outside, when not in stretch-mode
-- stage: correctly show projects with different aspect ratio
-- stage: correctly taking automatic screenshots during longer sessions
-- many smaller bugfixes and user experience improvements
-
-version 0.9.6
------------------
-- fix a bug where some projects could not be loaded
-
-version 0.9.5
------------------
-- improved "new object" workflow
-- tutorial and help
-- correct download link for Pocket Paint
-- bugfixes
-
-version 0.9.4
------------------
-- older programs should be openable again
-- alert dialog style
-- improved usability
-- bugfixes
-
-version 0.9.3
------------------
-- dialog redesign
-- improved usability
-- bugfixes
-
-version 0.9.2
------------------
-- fixed: copying a brick sometimes crashed the app
-
-version 0.9.1
------------------
-- Catrobat program's version will be updated now before the upload
-
-Public beta release 0.7 (2012-10-06)
------------------
-- UI: Redesign. Now using fragments, ActionBarSherlock for Pre-ICS devices. This was done as part of a Google Summer of Code 2012 project by our GSoC student [https://github.com/atermenji Artur Termenji]. Many thanks to him.
-- Fix: Better handling of the brick list. Added correct behaviour for nested loops.
-- Enhancement: Better performance in the Stage.
-- Enhancement: Upload and download of projects is now done in background, with notifications.
-- New: A new XML format for the Catrobat programs was introduced. '''Note:''' this means that all projects done with versions prior to 0.7.0 are not compatible with this release!
-- Many, many, many bugfixes. :)
-
-Public beta release 0.6 (2012-3-10)
------------------
-- Short version: Lots and lots of new stuff ;-) Please try it out!
-- Among others: Support for Lego Mindstorms robots, bricks galore (motion: place at, set x to, set y to, change x by, change y by, if on edge bounce, move n steps, turn left/right n degrees, point in direction, point towards, glide s seconds to x y, go back n layers, go to front; looks: switch to costume, next costume, sit size to, change size by, hide, show, set ghost effect to n%, change ghost effect by n, set brightness to n%, change brightness by, clear graphic effects; sound: play sound, stop all sounds, set volume to n%, change volume by, speak; control: when project starts, when tapped, wait s seconds, when I receive ABC as a message, broadcast ABC, broadcast ABC and wait, note, forever, repeat n times), a completely new design, our own sound recorder (some tablets do not have one preinstalled), better manual handling of bricks, and many more, e.g., auto scaling to different device resolutions with or without aspect ratio preservation, or a "report as inappropriate" button for uploaded projects. There are also many things behind the scene, e.g., new languages in all projects.
-
-Alpha release 0.5 (2011-4)
------------------
-- This was a refactoring-only release for internal use only.
-
-Alpha release 0.4 (2010-12-27)
------------------
-- new bricks: [come to front], [go back x layers], and [if touched do] ([http://blog.catroid.org/2011/01/multitouch-piano-project.html multitouch subject to phone capabilities])
-- coordinates range now from -1000 to +1000 in both X and Y directions, 1000 being the border and (0,0) in the center of the screen
-- website that hosts catroid project files: http://www.catroid.org/ (several demo projects there)
-- upload projects to http://www.catroid.org/ from inside catroid
-- extract, edit, and execute projects downloaded from http://www.catroid.org/
-- paintroid, a new paint editor:
- * allows to draw new pictures and edit old ones
- * save as ...
- * allows to pinch-zoom up to pixel level
- * allows to color whole areas or pixels to any color
- * colors can be chosen from a color in the picture or using a color chooser gadget
- * allows to set areas or pixels to transparent to delete unwanted background in costumes
- * many unit, functional, and regressions tests
-- [http://www.youtube.com/watch?v=WTppqL6Q4Y4&hd=1 demo video]
-
-Alpha release 0.3 (2010-09-20)
------------------
-- special background object (stage)
-- new brick: [scale to x %]
-- [http://www.youtube.com/watch?v=VZBCTjxD7Eo&feature=player_embedded tutorial]
-- [http://www.youtube.com/watch?v=vOv8Eli0cVs&feature=player_embedded demo video]
-
-Alpha release 0.2 (2010-08-09)
------------------
-- new bricks: [goto x y], [hide], and [show]
-- multiple sprites
-- save/load project file on SD card
-- transparent backgrounds in costumes
-- English/German according to phone language
-
-Alpha release 0.1 (2010-07-21)
------------------
-- one sprite only
-- German only
-- supported bricks: [set costume], [wait], and [play sound]
-- [http://www.youtube.com/watch?v=7AfwpKOhsos&feature=player_embedded demo video (in German)]
diff --git a/Jenkinsfile b/Jenkinsfile
index 01ca2dc3b20..9d38455b645 100644
--- a/Jenkinsfile
+++ b/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()
diff --git a/Jenkinsfile.baseDocker b/Jenkinsfile.baseDocker
index efc3d3163bc..4e5f9f2482b 100644
--- a/Jenkinsfile.baseDocker
+++ b/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()
diff --git a/Jenkinsfile.releaseAPK b/Jenkinsfile.releaseAPK
index 9326a48ccde..0baea16e60d 100644
--- a/Jenkinsfile.releaseAPK
+++ b/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
'''
}
}
diff --git a/README.md b/README.md
index 342a44bf1dc..ea7e414f4cc 100644
--- a/README.md
+++ b/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 #
diff --git a/catroid/build.gradle b/catroid/build.gradle
index 278cc36bc2c..efd7c775823 100644
--- a/catroid/build.gradle
+++ b/catroid/build.gradle
@@ -23,12 +23,10 @@
buildscript {
repositories {
- maven { url 'https://maven.fabric.io/public' }
google()
jcenter()
}
dependencies {
- classpath 'io.fabric.tools:gradle:1.31.0'
classpath 'com.google.gms:google-services:4.3.2'
}
}
@@ -40,28 +38,26 @@ plugins {
repositories {
mavenLocal()
maven { url "https://jitpack.io" }
- maven { url 'https://maven.fabric.io/public' }
}
ext {
appId = 'org.catrobat.catroid'
appName = '@string/app_name'
manifestAppName = '@string/app_name'
- manifestAppIcon = '@drawable/ic_launcher'
+ manifestAppIcon = '@mipmap/ic_launcher'
projectVersion = "0.9"
gdxVersion = "1.9.10"
mockitoVersion = "2.8.47"
espressoVersion = "3.1.0"
- paintroidVersion = "2.5.1"
+ paintroidVersion = "2.5.2"
playServicesVersion = "17.0.0"
- cameraXVersion = "1.0.0-beta06"
+ cameraXVersion = "1.0.0-beta07"
}
apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'
apply plugin: 'kotlin-kapt'
-apply plugin: 'io.fabric'
apply plugin: 'jacoco-android'
apply from: 'gradle/code_quality_tasks.gradle'
@@ -108,21 +104,10 @@ ext.copyGoogleServicesFile = { flavorName, flavorId ->
into "src/$flavorName"
filter { line ->
line.replaceAll('@appId@', flavorId)
- .replaceAll('@apiKey@', getProperty('firebaseApiKey', '@apiKey@'))
}
}
}
-copy {
- from "fabric-template.properties"
- rename { "fabric.properties" }
- into "."
- filter { line ->
- line.replaceAll('@fabricApiKey@', getProperty('fabricApiKey', "0123456789012345678901234567890123456789"))
- .replaceAll('@fabricApiSecret@', getProperty('fabricApiSecret', "0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"))
- }
-}
-
jacoco.toolVersion = "0.8.1"
jacocoAndroidUnitTestReport {
@@ -132,16 +117,16 @@ jacocoAndroidUnitTestReport {
}
android {
- compileSdkVersion 28
+ compileSdkVersion 29
defaultConfig {
minSdkVersion 21
- targetSdkVersion 28
+ targetSdkVersion 29
applicationId appId
testInstrumentationRunner 'org.catrobat.catroid.runner.UiTestApplicationRunner'
- versionCode 79
- versionName "0.9.74"
+ versionCode 80
+ versionName "0.9.75"
println "VersionCode is $versionCode"
println "VersionName is $versionName"
multiDexEnabled true
@@ -159,7 +144,6 @@ android {
buildConfigField "String", "PROJECT_NAME", "\"No Standalone Project\""
buildConfigField "String", "START_PROJECT", "\"No Starting Project\""
- buildConfigField "boolean", "CRASHLYTICS_CRASH_REPORT_ENABLED", "true"
buildConfigField "boolean", "USE_ANDROID_LOCALES_FOR_SCREENSHOTS", "false"
buildConfigField "boolean", "FEATURE_APK_GENERATOR_ENABLED", "false"
@@ -256,7 +240,6 @@ android {
debug {
buildConfigField "boolean", "USE_ANDROID_LOCALES_FOR_SCREENSHOTS", useAndroidLocales()
resValue "string", "DEBUG_MODE", "true"
- ext.enableCrashlytics = false
testCoverageEnabled = rootProject.hasProperty('enableCoverage')
signingConfig signingConfigs.debug
}
@@ -310,7 +293,6 @@ android {
buildConfigField "String", "START_PROJECT", "\"$projectId\""
buildConfigField "String", "PROJECT_NAME", "\"$appName\""
buildConfigField "boolean", "FEATURE_APK_GENERATOR_ENABLED", "true"
- buildConfigField "boolean", "CRASHLYTICS_CRASH_REPORT_ENABLED", "false"
}
}
@@ -353,7 +335,7 @@ dependencies {
// Kotlin
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
- implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.2'
+ implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.8'
// Support libraries
implementation 'androidx.appcompat:appcompat:1.1.0'
@@ -410,11 +392,11 @@ dependencies {
// CameraX
implementation "androidx.camera:camera-camera2:$cameraXVersion"
- implementation "androidx.camera:camera-lifecycle:$cameraXVersion"
- implementation 'androidx.camera:camera-view:1.0.0-alpha13'
+ implementation "androidx.camera:camera-lifecycle:${cameraXVersion}"
// ML Kit
implementation 'com.google.android.gms:play-services-mlkit-face-detection:16.0.0'
+ implementation 'com.google.android.gms:play-services-mlkit-text-recognition:16.1.0'
// libGDX
implementation "com.badlogicgames.gdx:gdx:$gdxVersion"
@@ -437,10 +419,6 @@ dependencies {
}
androidTestImplementation "androidx.test.espresso:espresso-web:$espressoVersion"
- implementation ('com.crashlytics.sdk.android:crashlytics:2.6.8@aar') {
- transitive = true
- }
-
testImplementation 'junit:junit:4.12'
testImplementation "org.mockito:mockito-core:$mockitoVersion"
testImplementation 'org.hamcrest:hamcrest-library:1.3'
diff --git a/catroid/config/lint-baseline.xml b/catroid/config/lint-baseline.xml
index ebe60c19ed3..265236dd3ff 100644
--- a/catroid/config/lint-baseline.xml
+++ b/catroid/config/lint-baseline.xml
@@ -1,7 +1,7 @@
+
+
+
+
+
+
+
+
+