From 03180501c9d7ee51b5a77154741b2219bb695ebc Mon Sep 17 00:00:00 2001
From: Tom Schmiedlechner <tschmiedlechner@outlook.com>
Date: Mon, 15 Jan 2024 15:45:17 +0100
Subject: [PATCH 1/6] Changed targetversion to 33

---
 .../Properties/AndroidManifest.xml                              | 2 +-
 .../Properties/AndroidManifest.xml                              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/fiskaltrust.AndroidLauncher.Grpc/Properties/AndroidManifest.xml b/src/fiskaltrust.AndroidLauncher.Grpc/Properties/AndroidManifest.xml
index 15c18671..08c11393 100644
--- a/src/fiskaltrust.AndroidLauncher.Grpc/Properties/AndroidManifest.xml
+++ b/src/fiskaltrust.AndroidLauncher.Grpc/Properties/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="eu.fiskaltrust.androidlauncher.grpc" android:installLocation="auto">
-	<uses-sdk android:minSdkVersion="24" android:targetSdkVersion="31" />
+	<uses-sdk android:minSdkVersion="24" android:targetSdkVersion="33" />
 	<application android:allowBackup="true" android:manageSpaceActivity="eu.fiskaltrust.androidlauncher.common.ManageSpaceActivity" android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:supportsRtl="true" android:theme="@style/AppTheme" android:extractNativeLibs="true"></application>
 	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 	<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
diff --git a/src/fiskaltrust.AndroidLauncher.Http/Properties/AndroidManifest.xml b/src/fiskaltrust.AndroidLauncher.Http/Properties/AndroidManifest.xml
index 92b1c3ff..23dc6f47 100644
--- a/src/fiskaltrust.AndroidLauncher.Http/Properties/AndroidManifest.xml
+++ b/src/fiskaltrust.AndroidLauncher.Http/Properties/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="eu.fiskaltrust.androidlauncher.http" android:installLocation="auto">
-	<uses-sdk android:minSdkVersion="24" android:targetSdkVersion="31" />
+	<uses-sdk android:minSdkVersion="24" android:targetSdkVersion="33" />
 	<application android:allowBackup="true" android:manageSpaceActivity="eu.fiskaltrust.androidlauncher.common.ManageSpaceActivity" android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:supportsRtl="true" android:theme="@style/AppTheme" android:extractNativeLibs="true" android:usesCleartextTraffic="true"></application>
 	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 	<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />

From 957aa68d8a1079120332572dad2b1bee2caa183f Mon Sep 17 00:00:00 2001
From: Tom Schmiedlechner <tschmiedlechner@outlook.com>
Date: Mon, 15 Jan 2024 16:01:21 +0100
Subject: [PATCH 2/6] Use default java

---
 azure-pipelines/middleware-launcher-android-ci-cd.yml | 6 ------
 submodules/middleware                                 | 1 +
 2 files changed, 1 insertion(+), 6 deletions(-)
 create mode 160000 submodules/middleware

diff --git a/azure-pipelines/middleware-launcher-android-ci-cd.yml b/azure-pipelines/middleware-launcher-android-ci-cd.yml
index 8402a194..625bdab9 100644
--- a/azure-pipelines/middleware-launcher-android-ci-cd.yml
+++ b/azure-pipelines/middleware-launcher-android-ci-cd.yml
@@ -63,12 +63,6 @@ stages:
               nugetConfigPath: "NuGet.config"
             displayName: Restore NuGet packages
 
-          - task: JavaToolInstaller@0
-            inputs:
-              versionSpec: "11"
-              jdkArchitectureOption: "x64"
-              jdkSourceOption: "PreInstalled"
-
           - task: XamarinAndroid@1
             inputs:
               projectFile: "**/fiskaltrust.AndroidLauncher.Http.csproj"
diff --git a/submodules/middleware b/submodules/middleware
new file mode 160000
index 00000000..7ba05758
--- /dev/null
+++ b/submodules/middleware
@@ -0,0 +1 @@
+Subproject commit 7ba057588f9e98315f1cc5ff8bfbe0337e7e3839

From 683a4092281785e11b4e2d24059f6a902fa9cf62 Mon Sep 17 00:00:00 2001
From: Tom Schmiedlechner <tschmiedlechner@outlook.com>
Date: Mon, 15 Jan 2024 16:08:21 +0100
Subject: [PATCH 3/6] Use Java 21

---
 azure-pipelines/middleware-launcher-android-ci-cd.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/azure-pipelines/middleware-launcher-android-ci-cd.yml b/azure-pipelines/middleware-launcher-android-ci-cd.yml
index 625bdab9..3358a401 100644
--- a/azure-pipelines/middleware-launcher-android-ci-cd.yml
+++ b/azure-pipelines/middleware-launcher-android-ci-cd.yml
@@ -63,6 +63,12 @@ stages:
               nugetConfigPath: "NuGet.config"
             displayName: Restore NuGet packages
 
+          - task: JavaToolInstaller@0
+            inputs:
+              versionSpec: "21"
+              jdkArchitectureOption: "x64"
+              jdkSourceOption: "PreInstalled"
+
           - task: XamarinAndroid@1
             inputs:
               projectFile: "**/fiskaltrust.AndroidLauncher.Http.csproj"

From 03e49af6421fe3a030c1cf67b83289e35bf76a4f Mon Sep 17 00:00:00 2001
From: Tom Schmiedlechner <tschmiedlechner@outlook.com>
Date: Mon, 15 Jan 2024 16:20:09 +0100
Subject: [PATCH 4/6] Let's try Java 17

---
 azure-pipelines/middleware-launcher-android-ci-cd.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/azure-pipelines/middleware-launcher-android-ci-cd.yml b/azure-pipelines/middleware-launcher-android-ci-cd.yml
index 3358a401..f0b7e80b 100644
--- a/azure-pipelines/middleware-launcher-android-ci-cd.yml
+++ b/azure-pipelines/middleware-launcher-android-ci-cd.yml
@@ -65,7 +65,7 @@ stages:
 
           - task: JavaToolInstaller@0
             inputs:
-              versionSpec: "21"
+              versionSpec: "17"
               jdkArchitectureOption: "x64"
               jdkSourceOption: "PreInstalled"
 

From 384c58f95f3361f894f1bb4c871c02ea5f2dc796 Mon Sep 17 00:00:00 2001
From: Tom Schmiedlechner <tschmiedlechner@outlook.com>
Date: Mon, 15 Jan 2024 16:41:40 +0100
Subject: [PATCH 5/6] Update TargetFramework of lib

---
 .../fiskaltrust.AndroidLauncher.Common.csproj                   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/fiskaltrust.AndroidLauncher.Common/fiskaltrust.AndroidLauncher.Common.csproj b/src/fiskaltrust.AndroidLauncher.Common/fiskaltrust.AndroidLauncher.Common.csproj
index 6c222b60..16502345 100644
--- a/src/fiskaltrust.AndroidLauncher.Common/fiskaltrust.AndroidLauncher.Common.csproj
+++ b/src/fiskaltrust.AndroidLauncher.Common/fiskaltrust.AndroidLauncher.Common.csproj
@@ -17,7 +17,7 @@
     <AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile>
     <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
     <AndroidUseLatestPlatformSdk>false</AndroidUseLatestPlatformSdk>
-    <TargetFrameworkVersion>v11.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v13.0</TargetFrameworkVersion>
     <AndroidUseAapt2>true</AndroidUseAapt2>
     <LangVersion>11.0</LangVersion>
   </PropertyGroup>

From 43824bb4ddad8a8722cc7ac282616bf5a869a023 Mon Sep 17 00:00:00 2001
From: Tom Schmiedlechner <tschmiedlechner@outlook.com>
Date: Mon, 15 Jan 2024 16:51:35 +0100
Subject: [PATCH 6/6] Ofc there's more than one target version

---
 .../fiskaltrust.AndroidLauncher.Grpc.csproj                     | 2 +-
 .../fiskaltrust.AndroidLauncher.Http.csproj                     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/fiskaltrust.AndroidLauncher.Grpc/fiskaltrust.AndroidLauncher.Grpc.csproj b/src/fiskaltrust.AndroidLauncher.Grpc/fiskaltrust.AndroidLauncher.Grpc.csproj
index cdc0b4fd..bc9508a5 100644
--- a/src/fiskaltrust.AndroidLauncher.Grpc/fiskaltrust.AndroidLauncher.Grpc.csproj
+++ b/src/fiskaltrust.AndroidLauncher.Grpc/fiskaltrust.AndroidLauncher.Grpc.csproj
@@ -19,7 +19,7 @@
     <AndroidResgenClass>Resource</AndroidResgenClass>
     <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
     <AndroidUseLatestPlatformSdk>false</AndroidUseLatestPlatformSdk>
-    <TargetFrameworkVersion>v12.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v13.0</TargetFrameworkVersion>
     <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
     <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
     <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
diff --git a/src/fiskaltrust.AndroidLauncher.Http/fiskaltrust.AndroidLauncher.Http.csproj b/src/fiskaltrust.AndroidLauncher.Http/fiskaltrust.AndroidLauncher.Http.csproj
index 8541ef22..9fe61966 100644
--- a/src/fiskaltrust.AndroidLauncher.Http/fiskaltrust.AndroidLauncher.Http.csproj
+++ b/src/fiskaltrust.AndroidLauncher.Http/fiskaltrust.AndroidLauncher.Http.csproj
@@ -19,7 +19,7 @@
     <AndroidResgenClass>Resource</AndroidResgenClass>
     <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
     <AndroidUseLatestPlatformSdk>false</AndroidUseLatestPlatformSdk>
-    <TargetFrameworkVersion>v12.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v13.0</TargetFrameworkVersion>
     <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
     <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
     <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>