wip

ci/merge.groovy

@@ -31,48 +31,13 @@ pipeline {
 	}
 
 	stages {
-		stage("git") {
-			parallel {
-				stage("git checkout mac") {
-					when {
-						expression {
-							return true
-						}
-					}
-					agent {
-						label targetMac
-					}
-					steps {
-						git(
-								url: "[email protected]:tutao/tutanota.git",
-								branch: params.BRANCH_NAME,
-								changelog: true,
-								poll: true
-						)
-					}
-				}
-
-				stage("git fetch and switch to branch") {
-
-					steps {
-						git(
-								url: "[email protected]:tutao/tutanota.git",
-								branch: params.BRANCH_NAME,
-								changelog: true,
-								poll: true
-						)
-
-					}
-				}
-			}
-		}
 		stage("sync submodules") {
 			steps {
-				sh '''
+				sh """			git switch ${params.BRANCH_NAME}
 				                git submodule init
 	                     		git submodule sync --recursive
 				                git submodule update
-			                   	'''
+			                   	"""
 				script {
 					def successfulMasterFetch = sh(returnStatus: true, script: "git fetch origin master:master").toInteger()
 					if (successfulMasterFetch != 0) {

tuta-sdk/android/sdk/build.gradle.kts

@@ -110,7 +110,7 @@ tasks.register("generateBinding") {
 		doLast {
 			exec {
 				this.executable("mkdir")
-				this.args("-p", "${layout.buildDirectory.asFile.get()}/rustJniLibs/android/${dir}")
+				this.args("-p", "${layout.buildDirectory.asFile.get()}/jniLibs/android/${dir}")
 			}
 			exec {
 				this.workingDir("../../rust")
@@ -123,7 +123,7 @@ tasks.register("generateBinding") {
 					"uniffi-bindgen",
 					"generate",
 					"--library",
-					"${layout.buildDirectory.asFile.get()}/rustJniLibs/android/${dir}/libtutasdk.so",
+					"${layout.buildDirectory.asFile.get()}/jniLibs/android/${dir}/libtutasdk.so",
 					"--language",
 					"kotlin",
 					"--out-dir",