mirror of
https://github.com/shadergz/cosmic-station.git
synced 2024-11-23 06:09:40 +00:00
Project
: Update internal dependencies
This commit is contained in:
parent
73880465e6
commit
d960de0b62
2
.gitmodules
vendored
2
.gitmodules
vendored
@ -20,4 +20,4 @@
|
|||||||
|
|
||||||
[submodule "app/src/main/cpp/addons/boost"]
|
[submodule "app/src/main/cpp/addons/boost"]
|
||||||
path = app/src/main/cpp/addons/boost
|
path = app/src/main/cpp/addons/boost
|
||||||
url = https://github.com/darkluar/boost.git
|
url = https://github.com/shadergz/boost.git
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project version="4">
|
<project version="4">
|
||||||
<component name="KotlinJpsPluginSettings">
|
<component name="KotlinJpsPluginSettings">
|
||||||
<option name="version" value="1.8.20" />
|
<option name="version" value="1.9.20" />
|
||||||
</component>
|
</component>
|
||||||
</project>
|
</project>
|
@ -2,7 +2,6 @@
|
|||||||
<component name="BuildAttributionWarningsFilter">
|
<component name="BuildAttributionWarningsFilter">
|
||||||
<option name="noGCSettingWarning" value="true" />
|
<option name="noGCSettingWarning" value="true" />
|
||||||
</component>
|
</component>
|
||||||
<component name="ExternalStorageConfigurationManager" enabled="true" />
|
|
||||||
<component name="NullableNotNullManager">
|
<component name="NullableNotNullManager">
|
||||||
<option name="myDefaultNullable" value="androidx.annotation.Nullable" />
|
<option name="myDefaultNullable" value="androidx.annotation.Nullable" />
|
||||||
<option name="myDefaultNotNull" value="androidx.annotation.NonNull" />
|
<option name="myDefaultNotNull" value="androidx.annotation.NonNull" />
|
||||||
|
@ -3,33 +3,38 @@
|
|||||||
<component name="VcsDirectoryMappings">
|
<component name="VcsDirectoryMappings">
|
||||||
<mapping directory="" vcs="Git" />
|
<mapping directory="" vcs="Git" />
|
||||||
<mapping directory="$PROJECT_DIR$/app/src/main/cpp/addons/Vulkan-Hpp" vcs="Git" />
|
<mapping directory="$PROJECT_DIR$/app/src/main/cpp/addons/Vulkan-Hpp" vcs="Git" />
|
||||||
<mapping directory="$PROJECT_DIR$/app/src/main/cpp/addons/Vulkan-Hpp/Vulkan-Headers" vcs="Git" />
|
|
||||||
<mapping directory="$PROJECT_DIR$/app/src/main/cpp/addons/Vulkan-Hpp/glfw" vcs="Git" />
|
|
||||||
<mapping directory="$PROJECT_DIR$/app/src/main/cpp/addons/Vulkan-Hpp/glm" vcs="Git" />
|
|
||||||
<mapping directory="$PROJECT_DIR$/app/src/main/cpp/addons/Vulkan-Hpp/glslang" vcs="Git" />
|
|
||||||
<mapping directory="$PROJECT_DIR$/app/src/main/cpp/addons/Vulkan-Hpp/tinyxml2" vcs="Git" />
|
|
||||||
<mapping directory="$PROJECT_DIR$/app/src/main/cpp/addons/VulkanMemoryAllocator" vcs="Git" />
|
<mapping directory="$PROJECT_DIR$/app/src/main/cpp/addons/VulkanMemoryAllocator" vcs="Git" />
|
||||||
<mapping directory="$PROJECT_DIR$/app/src/main/cpp/addons/boost" vcs="Git" />
|
<mapping directory="$PROJECT_DIR$/app/src/main/cpp/addons/boost" vcs="Git" />
|
||||||
<mapping directory="$PROJECT_DIR$/app/src/main/cpp/addons/boost/libs/array" vcs="Git" />
|
<mapping directory="$PROJECT_DIR$/app/src/main/cpp/addons/boost/libs/align" vcs="Git" />
|
||||||
<mapping directory="$PROJECT_DIR$/app/src/main/cpp/addons/boost/libs/assert" vcs="Git" />
|
<mapping directory="$PROJECT_DIR$/app/src/main/cpp/addons/boost/libs/atomic" vcs="Git" />
|
||||||
<mapping directory="$PROJECT_DIR$/app/src/main/cpp/addons/boost/libs/bind" vcs="Git" />
|
<mapping directory="$PROJECT_DIR$/app/src/main/cpp/addons/boost/libs/describe" vcs="Git" />
|
||||||
<mapping directory="$PROJECT_DIR$/app/src/main/cpp/addons/boost/libs/concept_check" vcs="Git" />
|
<mapping directory="$PROJECT_DIR$/app/src/main/cpp/addons/boost/libs/detail" vcs="Git" />
|
||||||
<mapping directory="$PROJECT_DIR$/app/src/main/cpp/addons/boost/libs/config" vcs="Git" />
|
<mapping directory="$PROJECT_DIR$/app/src/main/cpp/addons/boost/libs/filesystem" vcs="Git" />
|
||||||
<mapping directory="$PROJECT_DIR$/app/src/main/cpp/addons/boost/libs/container" vcs="Git" />
|
<mapping directory="$PROJECT_DIR$/app/src/main/cpp/addons/boost/libs/function_types" vcs="Git" />
|
||||||
<mapping directory="$PROJECT_DIR$/app/src/main/cpp/addons/boost/libs/container_hash" vcs="Git" />
|
<mapping directory="$PROJECT_DIR$/app/src/main/cpp/addons/boost/libs/functional" vcs="Git" />
|
||||||
<mapping directory="$PROJECT_DIR$/app/src/main/cpp/addons/boost/libs/conversion" vcs="Git" />
|
<mapping directory="$PROJECT_DIR$/app/src/main/cpp/addons/boost/libs/fusion" vcs="Git" />
|
||||||
<mapping directory="$PROJECT_DIR$/app/src/main/cpp/addons/boost/libs/core" vcs="Git" />
|
<mapping directory="$PROJECT_DIR$/app/src/main/cpp/addons/boost/libs/intrusive" vcs="Git" />
|
||||||
<mapping directory="$PROJECT_DIR$/app/src/main/cpp/addons/boost/libs/function" vcs="Git" />
|
<mapping directory="$PROJECT_DIR$/app/src/main/cpp/addons/boost/libs/io" vcs="Git" />
|
||||||
<mapping directory="$PROJECT_DIR$/app/src/main/cpp/addons/boost/libs/optional" vcs="Git" />
|
<mapping directory="$PROJECT_DIR$/app/src/main/cpp/addons/boost/libs/iterator" vcs="Git" />
|
||||||
<mapping directory="$PROJECT_DIR$/app/src/main/cpp/addons/boost/libs/range" vcs="Git" />
|
<mapping directory="$PROJECT_DIR$/app/src/main/cpp/addons/boost/libs/lexical_cast" vcs="Git" />
|
||||||
<mapping directory="$PROJECT_DIR$/app/src/main/cpp/addons/boost/libs/static_assert" vcs="Git" />
|
<mapping directory="$PROJECT_DIR$/app/src/main/cpp/addons/boost/libs/move" vcs="Git" />
|
||||||
<mapping directory="$PROJECT_DIR$/app/src/main/cpp/addons/boost/libs/tokenizer" vcs="Git" />
|
<mapping directory="$PROJECT_DIR$/app/src/main/cpp/addons/boost/libs/mp11" vcs="Git" />
|
||||||
<mapping directory="$PROJECT_DIR$/app/src/main/cpp/addons/boost/libs/unordered" vcs="Git" />
|
<mapping directory="$PROJECT_DIR$/app/src/main/cpp/addons/boost/libs/mpl" vcs="Git" />
|
||||||
<mapping directory="$PROJECT_DIR$/app/src/main/cpp/addons/boost/tools/cmake" vcs="Git" />
|
<mapping directory="$PROJECT_DIR$/app/src/main/cpp/addons/boost/libs/predef" vcs="Git" />
|
||||||
|
<mapping directory="$PROJECT_DIR$/app/src/main/cpp/addons/boost/libs/preprocessor" vcs="Git" />
|
||||||
|
<mapping directory="$PROJECT_DIR$/app/src/main/cpp/addons/boost/libs/scope" vcs="Git" />
|
||||||
|
<mapping directory="$PROJECT_DIR$/app/src/main/cpp/addons/boost/libs/smart_ptr" vcs="Git" />
|
||||||
|
<mapping directory="$PROJECT_DIR$/app/src/main/cpp/addons/boost/libs/system" vcs="Git" />
|
||||||
|
<mapping directory="$PROJECT_DIR$/app/src/main/cpp/addons/boost/libs/throw_exception" vcs="Git" />
|
||||||
|
<mapping directory="$PROJECT_DIR$/app/src/main/cpp/addons/boost/libs/tuple" vcs="Git" />
|
||||||
|
<mapping directory="$PROJECT_DIR$/app/src/main/cpp/addons/boost/libs/type_traits" vcs="Git" />
|
||||||
|
<mapping directory="$PROJECT_DIR$/app/src/main/cpp/addons/boost/libs/typeof" vcs="Git" />
|
||||||
|
<mapping directory="$PROJECT_DIR$/app/src/main/cpp/addons/boost/libs/utility" vcs="Git" />
|
||||||
|
<mapping directory="$PROJECT_DIR$/app/src/main/cpp/addons/boost/libs/variant2" vcs="Git" />
|
||||||
|
<mapping directory="$PROJECT_DIR$/app/src/main/cpp/addons/boost/libs/winapi" vcs="Git" />
|
||||||
<mapping directory="$PROJECT_DIR$/app/src/main/cpp/addons/fmt" vcs="Git" />
|
<mapping directory="$PROJECT_DIR$/app/src/main/cpp/addons/fmt" vcs="Git" />
|
||||||
<mapping directory="$PROJECT_DIR$/app/src/main/cpp/addons/imgui" vcs="Git" />
|
<mapping directory="$PROJECT_DIR$/app/src/main/cpp/addons/imgui" vcs="Git" />
|
||||||
<mapping directory="$PROJECT_DIR$/app/src/main/cpp/addons/perfetto" vcs="Git" />
|
<mapping directory="$PROJECT_DIR$/app/src/main/cpp/addons/perfetto" vcs="Git" />
|
||||||
<mapping directory="$PROJECT_DIR$/app/src/main/cpp/addons/range-v3" vcs="Git" />
|
<mapping directory="$PROJECT_DIR$/app/src/main/cpp/addons/range-v3" vcs="Git" />
|
||||||
<mapping directory="$PROJECT_DIR$/app/src/main/cpp/addons/range-v3/doc/gh-pages" vcs="Git" />
|
|
||||||
</component>
|
</component>
|
||||||
</project>
|
</project>
|
@ -15,6 +15,7 @@ android {
|
|||||||
applicationId = "emu.cosmic"
|
applicationId = "emu.cosmic"
|
||||||
minSdk = 31
|
minSdk = 31
|
||||||
|
|
||||||
|
//noinspection OldTargetApi
|
||||||
targetSdk = 34
|
targetSdk = 34
|
||||||
versionCode = 20
|
versionCode = 20
|
||||||
versionName = "0.0.20"
|
versionName = "0.0.20"
|
||||||
|
@ -1,9 +1,9 @@
|
|||||||
// Top-level build file where you can add configuration options common to all sub-projects/modules.
|
// Top-level build file where you can add configuration options common to all sub-projects/modules.
|
||||||
plugins {
|
plugins {
|
||||||
id("com.android.application") version "8.4.0" apply false
|
id("com.android.application") version "8.5.1" apply false
|
||||||
id("com.android.library") version "8.4.0" apply false
|
id("com.android.library") version "8.5.1" apply false
|
||||||
id("org.jetbrains.kotlin.android") version "1.8.20" apply false
|
id("org.jetbrains.kotlin.android") version "1.9.20" apply false
|
||||||
id("com.google.dagger.hilt.android") version "2.44" apply false
|
id("com.google.dagger.hilt.android") version "2.50" apply false
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks.register("clean") {
|
tasks.register("clean") {
|
||||||
|
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
@ -1,6 +1,6 @@
|
|||||||
#Tue Jul 18 23:12:32 BRT 2023
|
#Tue Jul 18 23:12:32 BRT 2023
|
||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
|
Loading…
Reference in New Issue
Block a user