Skip to content

Commit

Permalink
Merge pull request #3488 from Catrobat/release-0.9.69
Browse files Browse the repository at this point in the history
Release 0.9.69
  • Loading branch information
wslany authored Feb 23, 2020
2 parents 07f96e5 + d0f0ade commit 36dab46
Show file tree
Hide file tree
Showing 668 changed files with 6,777 additions and 4,300 deletions.
2 changes: 1 addition & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ pipeline {
catchError(buildResult: 'FAILURE' ,stageResult: 'FAILURE') {
sh '''./gradlew -PenableCoverage -PlogcatFile=instrumented_unit_logcat.txt -Pemulator=android28 \
startEmulator createCatroidDebugAndroidTestCoverageReport \
-Pandroid.testInstrumentationRunnerArguments.package=org.catrobat.catroid.test'''
-Pandroid.testInstrumentationRunnerArguments.class=org.catrobat.catroid.testsuites.LocalHeadlessTestSuite'''
}
}

Expand Down
52 changes: 52 additions & 0 deletions Jenkinsfile.OutgoingNetworkCallsTests
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
#!groovy

pipeline {
agent {
dockerfile {
filename 'Dockerfile.jenkins'
// 'docker build' would normally copy the whole build-dir to the container, changing the
// docker build directory avoids that overhead
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.
additionalBuildArgs '--build-arg USER_ID=$(id -u) --build-arg GROUP_ID=$(id -g) --build-arg KVM_GROUP_ID=$(getent group kvm | cut -d: -f3)'
args '--device /dev/kvm:/dev/kvm -v /var/local/container_shared/gradle_cache/$EXECUTOR_NUMBER:/home/user/.gradle -m=6.5G'
label 'LimitedEmulator'
}
}

options {
timeout(time: 2, unit: 'HOURS')
timestamps()
}

stages {
stage('End to end tests requiring share authentication') {
steps {
sh '''./gradlew -PenableCoverage -Pemulator=android28 \
startEmulator createCatroidDebugAndroidTestCoverageReport \
-Pandroid.testInstrumentationRunnerArguments.class=org.catrobat.catroid.testsuites.OutgoingNetworkCallsTestSuite'''
}
post {
always {
junit '**/*TEST*.xml'

sh './gradlew stopEmulator clearAvdStore'
archiveArtifacts 'logcat.txt'
}
}
}
}

post {
always {
step([$class: 'LogParserPublisher', failBuildOnError: true, projectRulePath: 'buildScripts/log_parser_rules', unstableOnWarning: true, useProjectRule: true])
}
unsuccessful {
notifyChat(['#s2cc', '#catroweb-deployment'])
}
}
}
46 changes: 20 additions & 26 deletions catroid/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* Catroid: An on-device visual programming system for Android devices
* Copyright (C) 2010-2018 The Catrobat Team
* Copyright (C) 2010-2020 The Catrobat Team
* (<http://developer.catrobat.org/credits>)
*
* This program is free software: you can redistribute it and/or modify
Expand Down Expand Up @@ -51,8 +51,7 @@ ext {
projectVersion = "0.9"
gdxVersion = "1.9.10"
mockitoVersion = "2.8.47"
espressoVersion = "3.0.1"
supportLibraryVersion = "28.0.0"
espressoVersion = "3.1.0"
paintroidVersion = "2.4.1"
}

Expand Down Expand Up @@ -134,8 +133,8 @@ android {
targetSdkVersion 28
applicationId appId
testInstrumentationRunner 'org.catrobat.catroid.runner.UiTestApplicationRunner'
versionCode 72
versionName "0.9.68"
versionCode 73
versionName "0.9.69"
println "VersionCode is $versionCode"
println "VersionName is $versionName"
multiDexEnabled true
Expand Down Expand Up @@ -318,21 +317,18 @@ dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"

// Support libraries
implementation "com.android.support:appcompat-v7:$supportLibraryVersion"
implementation "com.android.support:mediarouter-v7:$supportLibraryVersion"
implementation "com.android.support:cardview-v7:$supportLibraryVersion"
implementation "com.android.support:design:$supportLibraryVersion"
implementation "com.android.support:customtabs:$supportLibraryVersion"
implementation "com.android.support:exifinterface:$supportLibraryVersion"
implementation "com.android.support:support-v4:$supportLibraryVersion"
implementation 'androidx.appcompat:appcompat:1.1.0'
implementation 'androidx.mediarouter:mediarouter:1.1.0'
implementation 'androidx.cardview:cardview:1.0.0'
implementation 'com.google.android.material:material:1.0.0'
implementation 'androidx.browser:browser:1.2.0'

implementation "com.android.support.test.espresso:espresso-idling-resource:$espressoVersion"
implementation 'com.android.support:multidex:1.0.3'
implementation "androidx.test.espresso:espresso-idling-resource:$espressoVersion"
implementation 'androidx.multidex:multidex:2.0.1'

// Dagger
implementation 'com.google.dagger:dagger:2.21'
implementation 'com.google.dagger:dagger-android:2.21'
implementation 'com.google.dagger:dagger-android-support:2.21'
kapt 'com.google.dagger:dagger-compiler:2.21'
kapt 'com.google.dagger:dagger-android-processor:2.21'

Expand All @@ -345,7 +341,7 @@ dependencies {
// Analytics
implementation 'com.google.android.gms:play-services-analytics:12.0.0'

implementation 'com.google.guava:guava:19.0'
implementation 'com.google.guava:guava:28.2-android'
implementation 'com.google.code.gson:gson:2.8.0'

implementation 'com.koushikdutta.async:androidasync:2.2.1'
Expand Down Expand Up @@ -383,12 +379,11 @@ dependencies {

implementation 'com.google.android.gms:play-services-auth:12.0.0'

androidTestImplementation ('tools.fastlane:screengrab:1.1.0'){
exclude group: 'com.android.support'
}
androidTestImplementation ("com.android.support.test.espresso:espresso-web:$espressoVersion") {
exclude group: 'com.android.support'
androidTestImplementation('tools.fastlane:screengrab:1.2.0') {
// https://issuetracker.google.com/issues/123060356
exclude group: 'com.android.support.test.uiautomator', module: 'uiautomator-v18'
}
androidTestImplementation "androidx.test.espresso:espresso-web:$espressoVersion"

implementation ('com.crashlytics.sdk.android:crashlytics:2.6.8@aar') {
transitive = true
Expand All @@ -407,14 +402,13 @@ dependencies {

testImplementation 'org.reflections:reflections:0.9.11'

androidTestImplementation fileTree(include: '*.jar', dir: 'src/androidTest/libs')
androidTestImplementation 'com.linkedin.dexmaker:dexmaker-mockito:2.2.0'
androidTestImplementation "org.mockito:mockito-core:$mockitoVersion"

androidTestImplementation 'com.android.support.test:runner:1.0.1'
androidTestImplementation "com.android.support.test.espresso:espresso-core:$espressoVersion"
androidTestImplementation "com.android.support.test.espresso:espresso-contrib:$espressoVersion"
androidTestImplementation "com.android.support.test.espresso:espresso-intents:$espressoVersion"
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
androidTestImplementation "androidx.test.espresso:espresso-core:$espressoVersion"
androidTestImplementation "androidx.test.espresso:espresso-contrib:$espressoVersion"
androidTestImplementation "androidx.test.espresso:espresso-intents:$espressoVersion"

androidTestImplementation 'androidx.test.uiautomator:uiautomator:2.2.0'
}
Expand Down
55 changes: 34 additions & 21 deletions catroid/config/lint-baseline.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--Generated by crowdin.com-->
<!--
~ Catroid: An on-device visual programming system for Android devices
~ Copyright (C) 2010-2018 The Catrobat Team
Expand All @@ -21,16 +22,28 @@
~ You should have received a copy of the GNU Affero General Public License
~ along with this program. If not, see <http://www.gnu.org/licenses/>.
-->

<issues format="5" by="lint 3.5.2" client="gradle" variant="catroidDebug" version="3.5.2">

<issue
id="MissingSuperCall"
message="Overriding method should call `super.onActivityResult`"
errorLine1=" public void onActivityResult(int requestCode, int resultCode, Intent data) {"
errorLine2=" ~~~~~~~~~~~~~~~~">
<location
file="src/main/java/org/catrobat/catroid/bluetooth/ConnectBluetoothDeviceActivity.java"
line="352"
column="14"/>
</issue>

<issue
id="StaticFieldLeak"
message="Do not place Android context classes in static fields (static reference to `CastManager` which has field `initializingActivity` pointing to `AppCompatActivity`); this is a memory leak"
message="Do not place Android context classes in static fields (static reference to `CastManager` which has field `remoteLayout` pointing to `RelativeLayout`); this is a memory leak"
errorLine1=" private static final CastManager INSTANCE = new CastManager();"
errorLine2=" ~~~~~~">
<location
file="src/main/java/org/catrobat/catroid/cast/CastManager.java"
line="71"
line="72"
column="10"/>
</issue>

Expand All @@ -41,7 +54,7 @@
errorLine2=" ~~~~~~">
<location
file="src/main/java/org/catrobat/catroid/CatroidApplication.java"
line="44"
line="54"
column="10"/>
</issue>

Expand All @@ -52,7 +65,7 @@
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="src/main/java/org/catrobat/catroid/transfers/CheckOAuthTokenTask.java"
line="39"
line="40"
column="2"/>
</issue>

Expand All @@ -63,7 +76,7 @@
errorLine2=" ~~~~~~~~~~~~~~~~~">
<location
file="src/main/java/org/catrobat/catroid/bluetooth/ConnectBluetoothDeviceActivity.java"
line="154"
line="182"
column="16"/>
</issue>

Expand All @@ -74,7 +87,7 @@
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="src/main/java/org/catrobat/catroid/transfers/DeleteTestUserTask.java"
line="38"
line="39"
column="2"/>
</issue>

Expand All @@ -85,7 +98,7 @@
errorLine2=" ^">
<location
file="src/main/java/org/catrobat/catroid/drone/ardrone/DroneInitializer.java"
line="100"
line="101"
column="30"/>
</issue>

Expand All @@ -107,7 +120,7 @@
errorLine2=" ~~~~~~">
<location
file="src/main/java/org/catrobat/catroid/ui/fragment/FormulaEditorFragment.java"
line="99"
line="100"
column="10"/>
</issue>

Expand All @@ -118,7 +131,7 @@
errorLine2=" ~~~~~~">
<location
file="src/main/java/org/catrobat/catroid/ui/fragment/FormulaEditorFragment.java"
line="101"
line="102"
column="10"/>
</issue>

Expand All @@ -129,7 +142,7 @@
errorLine2=" ~~~~~~">
<location
file="src/main/java/org/catrobat/catroid/ui/fragment/FormulaEditorFragment.java"
line="103"
line="104"
column="10"/>
</issue>

Expand All @@ -140,7 +153,7 @@
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="src/main/java/org/catrobat/catroid/transfers/GoogleExchangeCodeTask.java"
line="42"
line="43"
column="2"/>
</issue>

Expand All @@ -151,7 +164,7 @@
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="src/main/java/org/catrobat/catroid/transfers/GoogleLogInTask.java"
line="43"
line="44"
column="2"/>
</issue>

Expand Down Expand Up @@ -351,7 +364,7 @@
errorLine2=" ~~~~~~~~~~~~">
<location
file="src/main/java/org/catrobat/catroid/ui/dragndrop/BrickListView.java"
line="167"
line="168"
column="17"/>
</issue>

Expand All @@ -362,7 +375,7 @@
errorLine2=" ~~~~~~~">
<location
file="src/main/java/org/catrobat/catroid/content/bricks/brickspinner/BrickSpinner.java"
line="166"
line="167"
column="20"/>
</issue>

Expand All @@ -373,7 +386,7 @@
errorLine2=" ~~~~~~~">
<location
file="src/main/java/org/catrobat/catroid/cast/CastManager.java"
line="206"
line="207"
column="19"/>
</issue>

Expand All @@ -384,7 +397,7 @@
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="src/main/java/org/catrobat/catroid/cast/CastManager.java"
line="223"
line="224"
column="4"/>
</issue>

Expand All @@ -395,7 +408,7 @@
errorLine2=" ~~~~~~~">
<location
file="src/main/java/org/catrobat/catroid/pocketmusic/fastscroller/FastScroller.java"
line="151"
line="152"
column="19"/>
</issue>

Expand All @@ -417,7 +430,7 @@
errorLine2=" ~~~~~~~">
<location
file="src/main/java/org/catrobat/catroid/ui/fragment/FormulaEditorFragment.java"
line="282"
line="283"
column="19"/>
</issue>

Expand All @@ -428,7 +441,7 @@
errorLine2=" ~~~~~~~~~~~~">
<location
file="src/main/java/org/catrobat/catroid/pocketmusic/ui/TactScrollRecyclerView.java"
line="96"
line="97"
column="17"/>
</issue>

Expand All @@ -439,7 +452,7 @@
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="src/main/java/org/catrobat/catroid/visualplacement/VisualPlacementActivity.java"
line="285"
line="286"
column="3"/>
</issue>

Expand All @@ -450,7 +463,7 @@
errorLine2=" ~~~~~~~">
<location
file="src/main/java/org/catrobat/catroid/visualplacement/VisualPlacementActivity.java"
line="289"
line="290"
column="17"/>
</issue>

Expand Down
1 change: 0 additions & 1 deletion catroid/gradle/standalone_apk_tasks.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
*/

import groovy.json.StringEscapeUtils
import groovy.xml.StreamingMarkupBuilder
import groovy.xml.XmlUtil

import java.nio.file.Files
Expand Down
Binary file not shown.
Loading

0 comments on commit 36dab46

Please sign in to comment.