diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 52aa6c5b..2bded3ba 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -30,8 +30,10 @@ jobs:
restore-keys: |
${{ runner.os }}-cxx-
- - name: Setup Environment for Gradle
- run: chmod +x gradlew
+ - name: Setup Environment for Gradle & Ninja Build
+ run: |
+ chmod +x gradlew
+ sudo apt-get install -y ninja-build
- name: Android Lint
run: ./gradlew --stacktrace lint
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 9914f3ea..5878864a 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -7,23 +7,8 @@
-
-
+
@@ -234,6 +219,7 @@
+
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 93ce5409..4e386e93 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,5 +1,6 @@
+
diff --git a/.idea/runConfigurations/Controller_Configuration.xml b/.idea/runConfigurations/Controller_Configuration.xml
index 6bd03f50..645c6d10 100644
--- a/.idea/runConfigurations/Controller_Configuration.xml
+++ b/.idea/runConfigurations/Controller_Configuration.xml
@@ -1,12 +1,13 @@
-
+
+
diff --git a/.idea/runConfigurations/Setting.xml b/.idea/runConfigurations/Setting.xml
index aa8992a6..8a3d09c1 100644
--- a/.idea/runConfigurations/Setting.xml
+++ b/.idea/runConfigurations/Setting.xml
@@ -1,12 +1,13 @@
-
+
+
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 3a13b456..e8819751 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -7,7 +7,6 @@
-
\ No newline at end of file
diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
index d93d0028..b32201bb 100644
--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -166,5 +166,6 @@ add_library(skyline SHARED
${source_DIR}/skyline/services/ssl/ISslContext.cpp
${source_DIR}/skyline/services/prepo/IPrepoService.cpp
)
+# target_precompile_headers(skyline PRIVATE ${source_DIR}/skyline/common.h) # PCH will currently break Intellisense
target_link_libraries(skyline vulkan android fmt lz4_static oboe mbedtls::mbedcrypto)
target_compile_options(skyline PRIVATE -Wall -Wno-unknown-attributes -Wno-c++20-extensions -Wno-c++17-extensions -Wno-c99-designator -Wno-reorder -Wno-missing-braces -Wno-unused-variable -Wno-unused-private-field)
diff --git a/app/build.gradle b/app/build.gradle
index 7a57355e..5c1fd7b0 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -20,7 +20,7 @@ android {
}
/* JVM Bytecode Options */
- def javaVersion = JavaVersion.VERSION_11
+ def javaVersion = JavaVersion.VERSION_1_8
compileOptions {
sourceCompatibility = javaVersion
targetCompatibility = javaVersion
@@ -83,8 +83,8 @@ dependencies {
/* Google */
implementation 'androidx.appcompat:appcompat:1.2.0'
implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
- implementation 'androidx.preference:preference:1.1.1'
- implementation 'com.google.android.material:material:1.3.0-rc01'
+ implementation 'androidx.preference:preference-ktx:1.1.1'
+ implementation 'com.google.android.material:material:1.3.0'
implementation 'androidx.documentfile:documentfile:1.0.1'
/* Kotlin */
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 053c9acd..34b43389 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -12,7 +12,7 @@
GetStringUTFChars(appFilesPathJstring, nullptr)};
- auto logger{std::make_shared(std::string(appFilesPath) + "skyline.log", static_cast(settings->logLevel))};
+ auto logger{std::make_shared(std::string(appFilesPath) + "skyline.log", settings->logLevel)};
auto start{std::chrono::steady_clock::now()};
diff --git a/app/src/main/cpp/skyline/common/settings.cpp b/app/src/main/cpp/skyline/common/settings.cpp
index 6fbdb078..e2b469d4 100644
--- a/app/src/main/cpp/skyline/common/settings.cpp
+++ b/app/src/main/cpp/skyline/common/settings.cpp
@@ -18,7 +18,7 @@ namespace skyline {
std::tuple preferences{
PREF_ELEM("operation_mode", operationMode, element.attribute("value").as_bool()),
PREF_ELEM("username_value", username, element.text().as_string()),
- PREF_ELEM("log_level", logLevel, element.attribute("value").as_int()),
+ PREF_ELEM("log_level", logLevel, static_cast(element.text().as_uint(static_cast(Logger::LogLevel::Info)))),
};
std::bitset> preferencesSet{}; // A bitfield to keep track of all the preferences we've set
diff --git a/app/src/main/cpp/skyline/common/settings.h b/app/src/main/cpp/skyline/common/settings.h
index 5084b85c..c4975586 100644
--- a/app/src/main/cpp/skyline/common/settings.h
+++ b/app/src/main/cpp/skyline/common/settings.h
@@ -11,7 +11,7 @@ namespace skyline {
*/
class Settings {
public:
- int logLevel; //!< The minimum level that logs need to be for them to be printed
+ Logger::LogLevel logLevel; //!< The minimum level that logs need to be for them to be printed
bool operationMode; //!< If the emulated Switch should be handheld or docked
std::string username; //!< The name set by the user to be supplied to the guest
diff --git a/build.gradle b/build.gradle
index e1a4d831..0c33228d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,13 +1,13 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
- ext.kotlin_version = '1.4.21'
+ ext.kotlin_version = '1.4.30'
repositories {
google()
jcenter()
}
dependencies {
- classpath 'com.android.tools.build:gradle:7.0.0-alpha04'
+ classpath 'com.android.tools.build:gradle:4.1.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
// NOTE: Do not place your application dependencies here; they belong
diff --git a/gradle.properties b/gradle.properties
index 7c18d521..c35dbe61 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -19,3 +19,5 @@ org.gradle.daemon=true
android.useAndroidX=true
# Automatically convert third-party libraries to use AndroidX
android.enableJetifier=true
+# Android NDK verbose build output
+android.native.buildOutput=verbose
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 14669801..94af0f10 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Jan 21 04:22:50 IST 2021
+#Mon Feb 08 07:42:45 GMT 2021
distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-milestone-1-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME