diff options
| author | stonedDiscord <Tukz@gmx.de> | 2022-05-24 21:16:04 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-24 21:16:04 +0200 |
| commit | d87371b65ea23a46263bfd3f038a01a81d0fe9c5 (patch) | |
| tree | 9d660b47954557a2a8ab54a965d900c2c5b6a370 /android | |
| parent | 868c26f52e4fbb4430ecb782b0551de90a1fae96 (diff) | |
GitHub android ci (#767)
* try this matrix thing
* syntax error
* use my own qt installer so it actually works
* allow changing path
* whoops cant have it twice
* get the right version of discord rpc
* get correct bass
* try to fix windows
* overwrite bass files
* forgot to delete these
* here's your version bro
* what did we even use catch2 for??
* linux doesnt have a c folder
* android bass
* switch from cmake to qmake
* opus dylib
* we don't install
* put bass in a subfolder so we don't build the stupid examples
* was using wrong arch for android
* fix up gitignore
* get correct artifact folder
* lets hope qmake will ignore the ABI for all the other platforms
* use platform name for artifact
* copy dlls into bin folder
* lmao i yeeted the folder
* create folder
* use more recent mingw
* windows uses dlls
* 2017 doesn't work
* our libs are 64 bit
* install msvc
* shitty ms documentation
* ok ms
* wrong directory for deploy
* copy apng
* use correct image for msvc2019
* deploy android
* 32bit windows it is
* adroideploy
* try this
* Update build.yml
* move libs
* armeabi-v7a
* fix android build files
* only get linux bass for linux
* don't try to install discord on android
* deploy mac
* get rid of double permission warning
* define filename for APK
* add mac dependencies
* put android bass in the correct folder
* mac apng
* android apng
* remove old CI
* ask for storage permissions
* qt bug ..........
* update clang-tidy-review
* update everything
* fuck you lukka
* fuck you jurplel for merging that shitty PR that broke everything
* give it what it wants
* Update clang-tidy-review.yml
* github is failing it because it's too big
* wait for the user and request a proper permission string
* underscore moment
* use write external storage instead
* try this instead
* 082 fails with docker again
Diffstat (limited to 'android')
| -rw-r--r-- | android/AndroidManifest.xml | 57 | ||||
| -rw-r--r-- | android/build.gradle | 17 | ||||
| -rw-r--r-- | android/res/drawable-hdpi/icon.png | bin | 0 -> 10866 bytes | |||
| -rw-r--r-- | android/res/drawable-ldpi/icon.png | bin | 29302 -> 2828 bytes | |||
| -rw-r--r-- | android/res/drawable-mdpi/icon.png | bin | 0 -> 5560 bytes | |||
| -rw-r--r-- | android/res/drawable-xhdpi/icon.png | bin | 0 -> 17788 bytes |
6 files changed, 44 insertions, 30 deletions
diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml index 0792ce86..33810959 100644 --- a/android/AndroidManifest.xml +++ b/android/AndroidManifest.xml @@ -1,16 +1,23 @@ <?xml version="1.0"?> -<manifest package="com.aceattorneyonline.ao2" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="2.6.2.0" android:versionCode="2" android:installLocation="auto"> - <application android:hardwareAccelerated="true" android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="Attorney Online 2" android:icon="@drawable/icon"> - <activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|layoutDirection|locale|fontScale|keyboard|keyboardHidden|navigation" android:name="org.qtproject.qt5.android.bindings.QtActivity" android:label="Attorney Online 2 Lobby" android:screenOrientation="unspecified" android:launchMode="singleTop"> +<manifest package="com.aceattorneyonline.ao2" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="2.10" android:versionCode="10" android:installLocation="auto"> + <!-- The following comment will be replaced upon deployment with default permissions based on the dependencies of the application. + Remove the comment if you do not require these default permissions. --> + <!-- %%INSERT_PERMISSIONS --> + + <!-- The following comment will be replaced upon deployment with default features based on the dependencies of the application. + Remove the comment if you do not require these default features. --> + <!-- %%INSERT_FEATURES --> + + <supports-screens android:largeScreens="true" android:normalScreens="true" android:anyDensity="true" android:smallScreens="true"/> + <application android:hardwareAccelerated="true" android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="Attorney Online 2" android:extractNativeLibs="true" android:icon="@drawable/icon"> + <activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|layoutDirection|locale|fontScale|keyboard|keyboardHidden|navigation|mcc|mnc|density" android:name="org.qtproject.qt5.android.bindings.QtActivity" android:label="Attorney Online 2 Lobby" android:screenOrientation="portrait" android:launchMode="singleTop"> <intent-filter> <action android:name="android.intent.action.MAIN"/> <category android:name="android.intent.category.LAUNCHER"/> </intent-filter> - <!-- Application arguments --> <!-- meta-data android:name="android.app.arguments" android:value="arg1 arg2 arg3"/ --> <!-- Application arguments --> - <meta-data android:name="android.app.lib_name" android:value="-- %%INSERT_APP_LIB_NAME%% --"/> <meta-data android:name="android.app.qt_sources_resource_id" android:resource="@array/qt_sources"/> <meta-data android:name="android.app.repository" android:value="default"/> @@ -18,25 +25,31 @@ <meta-data android:name="android.app.bundled_libs_resource_id" android:resource="@array/bundled_libs"/> <!-- Deploy Qt libs as part of package --> <meta-data android:name="android.app.bundle_local_qt_libs" android:value="-- %%BUNDLE_LOCAL_QT_LIBS%% --"/> - <meta-data android:name="android.app.bundled_in_lib_resource_id" android:resource="@array/bundled_in_lib"/> - <meta-data android:name="android.app.bundled_in_assets_resource_id" android:resource="@array/bundled_in_assets"/> <!-- Run with local libs --> <meta-data android:name="android.app.use_local_qt_libs" android:value="-- %%USE_LOCAL_QT_LIBS%% --"/> <meta-data android:name="android.app.libs_prefix" android:value="/data/local/tmp/qt/"/> + <meta-data android:name="android.app.load_local_libs_resource_id" android:resource="@array/load_local_libs"/> <meta-data android:name="android.app.load_local_libs" android:value="-- %%INSERT_LOCAL_LIBS%% --"/> <meta-data android:name="android.app.load_local_jars" android:value="-- %%INSERT_LOCAL_JARS%% --"/> <meta-data android:name="android.app.static_init_classes" android:value="-- %%INSERT_INIT_CLASSES%% --"/> + <!-- Used to specify custom system library path to run with local system libs --> + <!-- <meta-data android:name="android.app.system_libs_prefix" android:value="/system/lib/"/> --> <!-- Messages maps --> <meta-data android:value="@string/ministro_not_found_msg" android:name="android.app.ministro_not_found_msg"/> <meta-data android:value="@string/ministro_needed_msg" android:name="android.app.ministro_needed_msg"/> <meta-data android:value="@string/fatal_error_msg" android:name="android.app.fatal_error_msg"/> + <meta-data android:value="@string/unsupported_android_version" android:name="android.app.unsupported_android_version"/> <!-- Messages maps --> - <!-- Splash screen --> + <!-- Orientation-specific (portrait/landscape) data is checked first. If not available for current orientation, + then android.app.splash_screen_drawable. For best results, use together with splash_screen_sticky and + use hideSplashScreen() with a fade-out animation from Qt Android Extras to hide the splash screen when you + are done populating your window with content. --> + <!-- meta-data android:name="android.app.splash_screen_drawable_portrait" android:resource="@drawable/logo_portrait" / --> + <!-- meta-data android:name="android.app.splash_screen_drawable_landscape" android:resource="@drawable/logo_landscape" / --> <!-- meta-data android:name="android.app.splash_screen_drawable" android:resource="@drawable/logo"/ --> <!-- meta-data android:name="android.app.splash_screen_sticky" android:value="true"/ --> <!-- Splash screen --> - <!-- Background running --> <!-- Warning: changing this value to true may cause unexpected crashes if the application still try to draw after @@ -44,36 +57,22 @@ signal is sent! --> <meta-data android:name="android.app.background_running" android:value="false"/> <!-- Background running --> - <!-- auto screen scale factor --> <meta-data android:name="android.app.auto_screen_scale_factor" android:value="false"/> <!-- auto screen scale factor --> - <!-- extract android style --> <!-- available android:values : + * default - In most cases this will be the same as "full", but it can also be something else if needed, e.g., for compatibility reasons * full - useful QWidget & Quick Controls 1 apps * minimal - useful for Quick Controls 2 apps, it is much faster than "full" * none - useful for apps that don't use any of the above Qt modules --> - <meta-data android:name="android.app.extract_android_style" android:value="full"/> + <meta-data android:name="android.app.extract_android_style" android:value="default"/> <!-- extract android style --> - </activity> - - <!-- For adding service(s) please check: https://wiki.qt.io/AndroidServices --> - + </activity> + <!-- For adding service(s) please check: https://wiki.qt.io/AndroidServices --> </application> - <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="28"/> - <supports-screens android:largeScreens="true" android:normalScreens="true" android:anyDensity="true" android:smallScreens="true"/> - - <!-- The following comment will be replaced upon deployment with default permissions based on the dependencies of the application. - Remove the comment if you do not require these default permissions. --> - - - <!-- The following comment will be replaced upon deployment with default features based on the dependencies of the application. - Remove the comment if you do not require these default features. --> - <!-- %%INSERT_FEATURES --> - -<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/> - <uses-permission android:name="android.permission.INTERNET"/> + <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"/> + <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/> </manifest> diff --git a/android/build.gradle b/android/build.gradle index 3087d08c..443a8002 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -5,7 +5,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.5.0' + classpath 'com.android.tools.build:gradle:3.6.0' } } @@ -51,6 +51,15 @@ android { } } + tasks.withType(JavaCompile) { + options.incremental = true + } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + lintOptions { abortOnError false } @@ -59,4 +68,10 @@ android { aaptOptions { noCompress 'rcc' } + + defaultConfig { + resConfig "en" + minSdkVersion = qtMinSdkVersion + targetSdkVersion = qtTargetSdkVersion + } } diff --git a/android/res/drawable-hdpi/icon.png b/android/res/drawable-hdpi/icon.png Binary files differnew file mode 100644 index 00000000..18558219 --- /dev/null +++ b/android/res/drawable-hdpi/icon.png diff --git a/android/res/drawable-ldpi/icon.png b/android/res/drawable-ldpi/icon.png Binary files differindex f53fe30c..054666e7 100644 --- a/android/res/drawable-ldpi/icon.png +++ b/android/res/drawable-ldpi/icon.png diff --git a/android/res/drawable-mdpi/icon.png b/android/res/drawable-mdpi/icon.png Binary files differnew file mode 100644 index 00000000..e25a4fcc --- /dev/null +++ b/android/res/drawable-mdpi/icon.png diff --git a/android/res/drawable-xhdpi/icon.png b/android/res/drawable-xhdpi/icon.png Binary files differnew file mode 100644 index 00000000..cb0e4981 --- /dev/null +++ b/android/res/drawable-xhdpi/icon.png |
