Skip to content

Commit 163ae50

Browse files
authored
Merge pull request #1013 from Catrobat/release-v2.7.5
Release v2.7.5
2 parents 2e06cec + 4659f5d commit 163ae50

File tree

469 files changed

+21247
-17029
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

469 files changed

+21247
-17029
lines changed

.idea/codeStyles/Project.xml

Lines changed: 140 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Jenkinsfile

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@ def junitAndCoverage(String jacocoXmlFile, String coverageName, String javaSrcLo
1919
sh "./buildScripts/cover2cover.py '$jacocoXmlFile' '$coverageFile'"
2020
}
2121

22-
def useDebugLabelParameter(defaultLabel){
22+
def useDebugLabelParameter(defaultLabel) {
2323
return env.DEBUG_LABEL?.trim() ? env.DEBUG_LABEL : defaultLabel
2424
}
2525

2626
pipeline {
2727
parameters {
2828
string name: 'DEBUG_LABEL', defaultValue: '', description: 'For debugging when entered will be used as label to decide on which slaves the jobs will run.'
29-
string name: 'BUILD_WITH_CATROID', defaultValue: 'no', description: 'When set to \'yes\' the the current Paintroid build will be build with the current develop Branch of Catroid'
29+
booleanParam name: 'BUILD_WITH_CATROID', defaultValue: false, description: 'When checked then the current Paintroid build will be built with the current develop branch of Catroid'
3030
}
3131

3232
agent {
@@ -70,7 +70,9 @@ pipeline {
7070

7171
stage('Build with Catroid') {
7272
when {
73-
environment name: 'BUILD_WITH_CATROID', value: 'yes'
73+
expression {
74+
params.BUILD_WITH_CATROID
75+
}
7476
}
7577
steps {
7678
sh './gradlew publishToMavenLocal -Psnapshot'
@@ -85,15 +87,16 @@ pipeline {
8587

8688
stage('Static Analysis') {
8789
steps {
88-
sh './gradlew pmd checkstyle lint'
90+
sh './gradlew pmd checkstyle lint detekt'
8991
}
9092

9193
post {
9294
always {
9395
recordIssues aggregatingResults: true, enabledForFailure: true, qualityGates: [[threshold: 1, type: 'TOTAL', unstable: true]],
94-
tools: [androidLintParser(pattern: "$reports/lint*.xml"),
95-
checkStyle(pattern: "$reports/checkstyle.xml"),
96-
pmdParser(pattern: "$reports/pmd.xml")]
96+
tools: [androidLintParser(pattern: "$reports/lint*.xml"),
97+
checkStyle(pattern: "$reports/checkstyle.xml"),
98+
pmdParser(pattern: "$reports/pmd.xml"),
99+
detekt(pattern: "$reports/detekt/detekt.xml")]
97100
}
98101
}
99102
}

Paintroid/build.gradle

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -44,18 +44,13 @@ emulators {
4444

4545
apply plugin: 'com.android.library'
4646
apply plugin: 'com.hiya.jacoco-android'
47-
apply plugin: 'checkstyle'
48-
apply plugin: 'pmd'
4947
apply plugin: 'com.github.panpf.bintray-publish'
5048
apply plugin: 'com.getkeepsafe.dexcount'
5149
apply plugin: 'kotlin-android'
5250

5351
apply from: 'gradle/adb_tasks.gradle'
5452
apply from: 'gradle/code_quality_tasks.gradle'
5553

56-
check.dependsOn 'checkstyle'
57-
check.dependsOn 'pmd'
58-
5954
jacoco {
6055
toolVersion = "0.8.5"
6156
}
@@ -78,6 +73,11 @@ android {
7873
versionName rootProject.ext.androidVersionName
7974
}
8075

76+
compileOptions {
77+
sourceCompatibility JavaVersion.VERSION_1_8
78+
targetCompatibility JavaVersion.VERSION_1_8
79+
}
80+
8181
buildTypes {
8282
release {
8383
minifyEnabled false
@@ -121,6 +121,7 @@ dependencies {
121121
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.8'
122122
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.8'
123123
implementation 'androidx.exifinterface:exifinterface:1.3.2'
124+
implementation 'com.esotericsoftware:kryo:5.1.1'
124125

125126
debugImplementation 'androidx.multidex:multidex:2.0.0'
126127

@@ -137,11 +138,6 @@ dependencies {
137138
androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.1.0'
138139
androidTestImplementation 'androidx.test.espresso:espresso-intents:3.1.0'
139140
androidTestImplementation "androidx.test.uiautomator:uiautomator:2.2.0"
140-
141-
pmd 'net.sourceforge.pmd:pmd-core:6.32.0'
142-
pmd 'net.sourceforge.pmd:pmd-java:6.32.0'
143-
144-
checkstyle 'com.puppycrawl.tools:checkstyle:7.6'
145141
}
146142

147143
tasks.withType(Javadoc).all {

0 commit comments

Comments
 (0)