Skip to content

Commit

Permalink
chore: Update Ruffle, Rust deps, winit, ndk, android-activity, games-…
Browse files Browse the repository at this point in the history
…activity, Gradle, and its Android plugin
  • Loading branch information
torokati44 committed Jan 18, 2024
1 parent a5ead8b commit dea4e35
Show file tree
Hide file tree
Showing 12 changed files with 554 additions and 918 deletions.
10 changes: 10 additions & 0 deletions app/.idea/deploymentTargetDropDown.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 2 additions & 3 deletions app/.idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions app/.idea/migrations.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
plugins {
id 'com.android.application' version '8.1.0' apply false
id 'com.android.library' version '8.1.0' apply false
id 'com.android.application' version '8.2.1' apply false
id 'com.android.library' version '8.2.1' apply false
}

task clean(type: Delete) {
Expand Down
1 change: 0 additions & 1 deletion app/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,4 @@ android.useAndroidX=true
# resources declared in the library itself and none from the library's dependencies,
# thereby reducing the size of the R class for that library
android.nonTransitiveRClass=true
android.defaults.buildfeatures.buildconfig=true
android.nonFinalResIds=false
6 changes: 3 additions & 3 deletions app/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Thu Mar 24 17:39:17 CET 2022
#Tue Jan 16 22:20:46 CET 2024
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
6 changes: 3 additions & 3 deletions app/ruffle/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ plugins {
}

android {
compileSdk 33
compileSdk 34

buildFeatures {
prefab true
Expand Down Expand Up @@ -66,7 +66,7 @@ android {
dependencies {

implementation 'androidx.appcompat:appcompat:1.6.1'
implementation 'com.google.android.material:material:1.9.0'
implementation 'com.google.android.material:material:1.11.0'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
Expand All @@ -79,7 +79,7 @@ dependencies {
//implementation "androidx.games:games-performance-tuner:1.5.0"

// To use the Games Activity library
implementation "androidx.games:games-activity:1.1.0"
implementation "androidx.games:games-activity:2.0.2"

// To use the Games Controller Library
//implementation "androidx.games:games-controller:1.1.0"
Expand Down
9 changes: 9 additions & 0 deletions native/.idea/native.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit dea4e35

Please sign in to comment.