Use a password for the codesigning certificate

.github/workflows/osx.yml

@@ -36,9 +36,22 @@ jobs:
           repository: tumic0/QtPBFImagePlugin
           path: GPXSee.app/Contents/Plugins/imageformats
           merge-multiple: true
-          run-id: ${{steps.runid.outputs.runid}}
+          run-id: ${{ steps.runid.outputs.runid }}
+      - name: Install codesigning certificate
+        env:
+          MACOS_CERTIFICATE: ${{ secrets.CODESIGN_CERT }}
+          MACOS_CERTIFICATE_PWD: ${{ secrets.CODESIGN_PWD }}
+          KEYCHAIN_NAME: gpxsee
+          KEYCHAIN_PWD: password
+        run: |
+          echo $MACOS_CERTIFICATE | base64 --decode > certificate.p12
+          security create-keychain -p $KEYCHAIN_PWD $KEYCHAIN_NAME
+          security default-keychain -s $KEYCHAIN_NAME
+          security unlock-keychain -p $KEYCHAIN_PWD $KEYCHAIN_NAME
+          security import certificate.p12 -k $KEYCHAIN_NAME -P $MACOS_CERTIFICATE_PWD -T /usr/bin/codesign
+          security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k $KEYCHAIN_PWD $KEYCHAIN_NAME
       - name: Create DMG
-        run: macdeployqt GPXSee.app -dmg -appstore-compliant
+        run: macdeployqt GPXSee.app -dmg -appstore-compliant -codesign=GPXSee
       - name: Upload artifacts
         uses: actions/upload-artifact@v4
         with:

pkg/android/AndroidManifest.xml

@@ -1,30 +1,10 @@
 <?xml version="1.0"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.gpxsee.gpxsee" android:installLocation="auto" android:versionCode="-- %%INSERT_VERSION_CODE%% --" android:versionName="-- %%INSERT_VERSION_NAME%% --">
-    package="org.gpxsee.gpxsee"
-    android:installLocation="auto"
-    android:versionCode="-- %%INSERT_VERSION_CODE%% --"
-    android:versionName="-- %%INSERT_VERSION_NAME%% --">
     <!-- %%INSERT_PERMISSIONS -->
     <!-- %%INSERT_FEATURES -->
-    <supports-screens
+    <supports-screens android:anyDensity="true" android:largeScreens="true" android:normalScreens="true" android:smallScreens="true"/>
-        android:anyDensity="true"
+    <application android:name="org.qtproject.qt.android.bindings.QtApplication" android:extractNativeLibs="true" android:hardwareAccelerated="true" android:label="-- %%INSERT_APP_NAME%% --" android:requestLegacyExternalStorage="true" android:allowNativeHeapPointerTagging="false" android:icon="@drawable/icon">
-        android:largeScreens="true"
+        <activity android:name="org.gpxsee.gpxsee.Activity" android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|layoutDirection|locale|fontScale|keyboard|keyboardHidden|navigation|mcc|mnc|density" android:label="-- %%INSERT_APP_NAME%% --" android:launchMode="singleTop" android:screenOrientation="unspecified" android:exported="true">
-        android:normalScreens="true"
-        android:smallScreens="true"/>
-    <application
-        android:name="org.qtproject.qt.android.bindings.QtApplication"
-        android:hardwareAccelerated="true"
-        android:label="-- %%INSERT_APP_NAME%% --"
-        android:requestLegacyExternalStorage="true"
-        android:allowBackup="true"
-        android:fullBackupOnly="false"
-        android:icon="@drawable/icon">
-        <activity
-            android:name="org.gpxsee.gpxsee.Activity"
-            android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|layoutDirection|locale|fontScale|keyboard|keyboardHidden|navigation|mcc|mnc|density"
-            android:launchMode="singleTop"
-            android:screenOrientation="unspecified"
-            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
@@ -48,22 +28,10 @@
                 <data android:scheme="geo"/>
             </intent-filter>
 
-          <meta-data
+            <meta-data android:name="android.app.lib_name" android:value="-- %%INSERT_APP_LIB_NAME%% --"/>
-                android:name="android.app.lib_name"
+            <meta-data android:name="android.app.arguments" android:value="-- %%INSERT_APP_ARGUMENTS%% --"/>
-                android:value="-- %%INSERT_APP_LIB_NAME%% --"/>
+            <meta-data android:name="android.app.extract_android_style" android:value="minimal"/>
-          <meta-data
-                android:name="android.app.arguments"
-                android:value="-- %%INSERT_APP_ARGUMENTS%% --"/>
         </activity>
-
-        <provider
-            android:name="androidx.core.content.FileProvider"
-            android:authorities="${applicationId}.qtprovider"
-            android:exported="false"
-            android:grantUriPermissions="true">
-            <meta-data
-                android:name="android.support.FILE_PROVIDER_PATHS"
-                android:resource="@xml/qtprovider_paths"/>
-        </provider>
     </application>
+
 </manifest>

pkg/android/build.gradle

@@ -5,8 +5,7 @@ buildscript {
     }
 
     dependencies {
-        //noinspection AndroidGradlePluginVersion
+        classpath 'com.android.tools.build:gradle:7.2.1'
-        classpath 'com.android.tools.build:gradle:8.8.0'
     }
 }
 
@@ -15,12 +14,10 @@ repositories {
     mavenCentral()
 }
 
-apply plugin: qtGradlePluginType
+apply plugin: 'com.android.application'
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
-    //noinspection GradleDependency
-    implementation 'androidx.core:core:1.13.1'
 }
 
 android {
@@ -31,18 +28,20 @@ android {
      * - qtAndroidDir - holds the path to qt android files
      *                   needed to build any Qt application
      *                   on Android.
-     * - qtGradlePluginType - whether to build an app or a library
      *
      * are defined in gradle.properties file. This file is
      * updated by QtCreator and androiddeployqt tools.
      * Changing them manually might break the compilation!
      *******************************************************/
 
-    namespace androidPackageName
+    //compileSdkVersion androidCompileSdkVersion
-    compileSdkVersion androidCompileSdkVersion
+    compileSdkVersion "android-33"
     buildToolsVersion androidBuildToolsVersion
     ndkVersion androidNdkVersion
 
+    // Extract native libraries from the APK
+    packagingOptions.jniLibs.useLegacyPackaging true
+
     sourceSets {
         main {
             manifest.srcFile 'AndroidManifest.xml'

pkg/android/res/values/libs.xml

@@ -17,5 +17,4 @@
     <string name="static_init_classes"><!-- %%INSERT_INIT_CLASSES%% --></string>
     <string name="use_local_qt_libs"><!-- %%USE_LOCAL_QT_LIBS%% --></string>
     <string name="bundle_local_qt_libs"><!-- %%BUNDLE_LOCAL_QT_LIBS%% --></string>
-    <string name="system_libs_prefix"><!-- %%SYSTEM_LIBS_PREFIX%% --></string>
 </resources>

pkg/android/res/xml/qtprovider_paths.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<paths xmlns:android="http://schemas.android.com/apk/res/android">
-    <!-- For getFilesDirectory() -->
-    <files-path name="files_path" path="/"/>
-    <!-- For getExternalStorageDirectory() -->
-    <external-path name="external_path" path="/"/>
-    <!-- For getExternalFilesDir() -->
-    <external-files-path name="external_files_path" path="/"/>
-    <!-- For getExternalCacheDir() -->
-    <external-cache-path name="external_cache_path" path="/"/>
-</paths>