Add revision: v1.22.7

CMakeLists.txt

@@ -56,7 +56,7 @@ if(UNIX AND NOT IOS)
 	set(CMAKE_OSX_DEPLOYMENT_TARGET 10.13 CACHE STRING "Required macOS version")
 endif()
 
-project(AusweisApp2 VERSION 1.22.6 LANGUAGES ${LANGUAGES})
+project(AusweisApp2 VERSION 1.22.7 LANGUAGES ${LANGUAGES})
 
 # Set TWEAK if not defined in PROJECT_VERSION above to
 # have a valid tweak version without propagating it

docs/releasenotes/1.22.7.rst

@@ -0,0 +1,14 @@
+AusweisApp2 1.22.7
+^^^^^^^^^^^^^^^^^^
+
+**Releasedatum:** 20. Mai 2022
+
+
+Anwender
+""""""""
+- Ein Absturz bei den neuen Systembenachrichtigungen ab
+  macOS 10.14 wurde behoben.
+
+
+Entwickler
+""""""""""

docs/releasenotes/appcast.rst

@@ -4,6 +4,7 @@ Release Notes
 .. toctree::
    :maxdepth: 1
 
+   1.22.7
    1.22.6
    1.22.5
    1.22.4

docs/releasenotes/support.rst

@@ -52,13 +52,13 @@ und sollte daher mit allen marktüblichen Browsern verwendet werden können.
 Im Rahmen der Qualitätssicherung werden die folgenden Browserversionen
 getestet.
 
-- Chrome 100
+- Chrome 101
 
-- Firefox 99
+- Firefox 100
 
 - Internet Explorer 11
 
-- Safari 15.3
+- Safari 15.4
 
 - Edge 98
 
@@ -118,9 +118,9 @@ Im mobilen Umfeld ist die Funktionalität jedoch abhängig von der vom
 Anbieter umgesetzten Aktivierung. Daher empfehlen wir einen der
 folgenden Browser zu verwenden.
 
-- Chrome 100 (iOS/Android)
+- Chrome 101 (iOS/Android)
 
-- Firefox 99 (iOS/Android)
+- Firefox 100 (iOS/Android)
 
 - Safari 15.3 (iOS)
 

docs/releasenotes/versions.rst

@@ -6,6 +6,7 @@ Versionszweig 1.22
 .. toctree::
    :maxdepth: 1
 
+   1.22.7
    1.22.6
    1.22.5
    1.22.4

resources/jenkins/dsl/Review_Trigger_Configuration.groovy

@@ -0,0 +1,7 @@
+import common.RootTrigger
+
+def j = new RootTrigger
+	(
+		jobName: '_Review_Trigger_Configuration_',
+		triggerJob: '${REVIEW_BRANCH}__Review_Trigger_Configuration'
+	).generate(this)

resources/jenkins/dsl/Reviews/Review_Configuration.groovy

@@ -0,0 +1,50 @@
+import common.Review
+import common.Build.JobType
+import static common.Constants.strip
+
+def j = new Review
+	(
+		name: 'Configuration',
+		libraries: ['Linux'],
+		label: 'Linux',
+		artifacts: 'tmp/*.log',
+		allowEmptyArtifacts: true,
+		xunit: true
+	).generate(this)
+
+
+j.with
+{
+	wrappers
+	{
+		environmentVariables
+		{
+			env("QT_PLUGIN_PATH", '$WORKSPACE/libs/build/dist/plugins')
+		}
+	}
+
+	steps
+	{
+		shell('cd source; cmake -DCMD=IMPORT_PATCH -P cmake/cmd.cmake')
+
+		shell(strip('''\
+			cd build;
+			cmake -Werror=dev ../source
+			-DCMAKE_PREFIX_PATH=${WORKSPACE}/libs/build/dist
+			-DCMAKE_CXX_COMPILER_LAUNCHER=ccache
+			-DBUILD_SHARED_LIBS=on
+			'''))
+
+		shell('''\
+			cd build; make ${MAKE_FLAGS} ALL_Test_configuration
+			'''.stripIndent().trim())
+
+		shell('''\
+			cd build; ctest --output-on-failure ${MAKE_FLAGS} -R Test_configuration
+			'''.stripIndent().trim())
+
+		shell('''\
+			cd build; ctest --output-on-failure ${MAKE_FLAGS} -L json
+			'''.stripIndent().trim())
+	}
+}

resources/jenkins/dsl/Reviews/Review_Trigger_Configuration.groovy

@@ -0,0 +1,64 @@
+import common.Trigger
+import common.Constants
+import common.Build.JobType
+import static common.Constants.createEnvMap
+import static common.Constants.createReviewMessage
+import static common.Constants.getEnvNumber
+
+def getJobs()
+{
+	return ['Formatting', 'Configuration']
+}
+
+String getName(String name)
+{
+	return "${MERCURIAL_REVISION_BRANCH}_Review_" + name
+}
+
+def envMap = createEnvMap(getJobs(), this.&getName)
+def reviewMessage = createReviewMessage(getJobs(), this.&getName)
+
+
+def j = new Trigger
+	(
+		name: '_Review_Trigger_Configuration',
+		jobType: JobType.Multi
+	).generate(this)
+
+
+j.with
+{
+	concurrentBuild()
+
+	wrappers
+	{
+		environmentVariables
+		{
+			envs(envMap)
+		}
+	}
+
+	steps
+	{
+		shell('cd source; hg import --no-commit ../patch.diff')
+
+		phase('General', 'UNSTABLE')
+		{
+			phaseJob(getName('Formatting'))
+		}
+
+		phase('Unit Tests', 'UNSTABLE')
+		{
+			phaseJob(getName('Configuration'))
+		}
+	}
+
+	configure
+	{
+		project -> project / 'publishers' << 'org.jenkinsci.plugins.jenkinsreviewbot.ReviewboardNotifier' {
+			shipItOnSuccess 'false'
+			useMarkdown 'true'
+			customMessage "${reviewMessage}"
+		}
+	}
+}

resources/updatable-files/supported-providers.json

@@ -1053,7 +1053,7 @@
 			"longDescription": {
 				"": "Internetbasierte An-, Ab- und Ummeldung von Kraftfahrzeugen"
 			},
-			"address": "https://www.kreis-viersen.de/de/dienstleistungen/ikfz",
+			"address": "https://kreis-viersen.de/ikfz",
 			"homepage": "https://www.kreis-viersen.de",
 			"phone": "+49 2162 39 1566",
 			"email": "post@kreis-viersen.de",

src/ui/common/PlatformTools_osx.mm

@@ -36,7 +36,7 @@
 }
 
 
-void ensureNotificationPermission(const std::function<void()>& pCallback)
+void ensureNotificationPermission(std::function<void()> pCallback)
 {
 #ifdef QT_NO_DEBUG
 	if (@available(macOS 10.14, *))

test/qt/CMakeLists.txt

@@ -112,6 +112,7 @@ function(ADD_TEST_EXECUTABLE_SUBDIR)
 		ADD_TEST_EXECUTABLE(${TESTNAME} ${sourcefile})
 		GET_TEST_CMDLINE(TEST_CMDLINE ${TESTNAME})
 		add_test(${TESTNAME} ${TESTNAME} ${TEST_CMDLINE})
+		add_dependencies(${TESTNAME} AusweisAppRcc)
 		set_tests_properties(${TESTNAME} PROPERTIES FAIL_REGULAR_EXPRESSION "nullptr parameter")
 		set_tests_properties(${TESTNAME} PROPERTIES ENVIRONMENT "QT_ENABLE_REGEXP_JIT=0")
 
@@ -120,6 +121,15 @@ function(ADD_TEST_EXECUTABLE_SUBDIR)
 		else()
 			set_tests_properties(${TESTNAME} PROPERTIES LABELS "ausweisapp" TIMEOUT 120)
 		endif()
+
+		# Create a target for each folder and add each test as a dependency
+		get_filename_component(TEST_FOLDER_TARGET ${sourcefile} DIRECTORY)
+		EXTRACT_TESTNAME(TEST_FOLDER_TARGET ${TEST_FOLDER_TARGET})
+		set(TEST_FOLDER_TARGET "ALL_${TEST_FOLDER_TARGET}")
+		if(NOT TARGET ${TEST_FOLDER_TARGET})
+			add_custom_target(${TEST_FOLDER_TARGET})
+		endif()
+		add_dependencies(${TEST_FOLDER_TARGET} ${TESTNAME})
 	endforeach()
 endfunction()