The-Homebrew-Cloud/skyline
2
0
Fork 0
mirror of https://github.com/skyline-emu/skyline.git synced 2025-01-09 22:49:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update Kotlin (1.7.10), NDK (25.0.8775105), AGP (7.2.2) and Kotlin deps

Browse Source
This commit is contained in:
lynxnb 2022-08-17 12:28:31 +02:00
parent e9618d9e2c
commit 39f398f76b
3 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/ci.yml vendored
View File

@ -42,7 +42,7 @@ jobs:
ln -s /usr/bin/ninja . ln -s /usr/bin/ninja .
- name: Install CMake & Android NDK - name: Install CMake & Android NDK
run: echo "yes" | $ANDROID_HOME/tools/bin/sdkmanager "cmake;3.18.1" "ndk;25.0.8221429" --channel=3 | grep -v = || true run: echo "yes" | $ANDROID_HOME/tools/bin/sdkmanager "cmake;3.22.1" "ndk;25.0.8775105" --channel=3 | grep -v = || true
- name: Decode Keystore - name: Decode Keystore
if: ${{ env.IS_SKYLINE_SIGNED == 'true' }} if: ${{ env.IS_SKYLINE_SIGNED == 'true' }}

16
app/build.gradle
View File

@ -8,7 +8,7 @@ plugins {
} }
idea.module { idea.module {
// These are not viable to index on most systems to exclude them to prevent IDE crashes // These are not viable to index on most systems so exclude them to prevent IDE crashes
excludeDirs.add(file("libraries/boost")) excludeDirs.add(file("libraries/boost"))
excludeDirs.add(file("libraries/llvm")) excludeDirs.add(file("libraries/llvm"))
} }
@ -91,10 +91,10 @@ android {
} }
/* NDK and CMake */ /* NDK and CMake */
ndkVersion '25.0.8221429' ndkVersion '25.0.8775105'
externalNativeBuild { externalNativeBuild {
cmake { cmake {
version '3.18.1+' version '3.22.1+'
path "CMakeLists.txt" path "CMakeLists.txt"
} }
} }
@ -116,16 +116,16 @@ android {
dependencies { dependencies {
/* Google */ /* Google */
implementation 'androidx.core:core-ktx:1.7.0' implementation 'androidx.core:core-ktx:1.8.0'
implementation 'androidx.appcompat:appcompat:1.4.1' implementation 'androidx.appcompat:appcompat:1.5.0'
implementation 'androidx.constraintlayout:constraintlayout:2.1.3' implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
implementation 'androidx.preference:preference-ktx:1.2.0' implementation 'androidx.preference:preference-ktx:1.2.0'
implementation 'com.google.android.material:material:1.5.0' implementation 'com.google.android.material:material:1.6.1'
implementation 'androidx.documentfile:documentfile:1.0.1' implementation 'androidx.documentfile:documentfile:1.0.1'
implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0' implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version" implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version" implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version"
implementation 'androidx.fragment:fragment-ktx:1.4.1' implementation 'androidx.fragment:fragment-ktx:1.5.2'
implementation "com.google.dagger:hilt-android:$hilt_version" implementation "com.google.dagger:hilt-android:$hilt_version"
kapt "com.google.dagger:hilt-android-compiler:$hilt_version" kapt "com.google.dagger:hilt-android-compiler:$hilt_version"
implementation 'com.google.android.flexbox:flexbox:3.0.0' implementation 'com.google.android.flexbox:flexbox:3.0.0'

9
build.gradle
View File

@ -2,18 +2,19 @@
buildscript { buildscript {
ext { ext {
kotlin_version = '1.6.21' kotlin_version = '1.7.10'
serialization_version = '1.3.3' serialization_version = '1.3.3'
lifecycle_version = '2.4.1' lifecycle_version = '2.5.1'
hilt_version = '2.41' hilt_version = '2.43.2'
} }
repositories { repositories {
google() google()
mavenCentral() mavenCentral()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:7.1.3' classpath 'com.android.tools.build:gradle:7.2.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version" classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version"