Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update dependencies used in hello-vulkan. #952

Merged
merged 1 commit into from
Jan 11, 2024
Merged

Update dependencies used in hello-vulkan. #952

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 14 additions & 5 deletions hello-vulkan/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ apply plugin: 'kotlin-android'

android {
compileSdk 33
ndkVersion '25.1.8937393'
ndkVersion '25.2.9519653'

defaultConfig {
shaders {
Expand Down Expand Up @@ -50,13 +50,22 @@ android {
buildFeatures {
prefab true
}

namespace 'com.android.hellovk'

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}

kotlinOptions {
jvmTarget = '1.8'
}
}

dependencies {
implementation 'androidx.core:core:1.9.0'
implementation 'androidx.appcompat:appcompat:1.5.1'
implementation 'androidx.games:games-activity:1.2.2-alpha01'
implementation 'androidx.core:core-ktx:1.10.1'
implementation 'androidx.appcompat:appcompat:1.6.1'
implementation 'androidx.games:games-activity:2.1.0-alpha01'
}

2 changes: 2 additions & 0 deletions hello-vulkan/app/src/main/java/com/android/hellovk/VulkanActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,8 @@ class VulkanActivity : GameActivity() {
return processed
}

// TODO: Migrate to androidx.activity.OnBackPressedCallback.
// onBackPressed is deprecated.
override fun onBackPressed() {
System.gc()
System.exit(0)
Expand Down
4 changes: 2 additions & 2 deletions hello-vulkan/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@

buildscript {
ext {
kotlin_version = '1.7.21'
kotlin_version = '1.8.20'
}
repositories {
google()
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:7.3.1'
classpath 'com.android.tools.build:gradle:8.1.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}
Expand Down
3 changes: 3 additions & 0 deletions hello-vulkan/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,10 @@

# Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings.
android.defaults.buildfeatures.buildconfig=true
android.enableJetifier=true
android.nonFinalResIds=false
android.nonTransitiveRClass=false
android.useAndroidX=true
org.gradle.jvmargs=-Xmx1536m

Expand Down
2 changes: 1 addition & 1 deletion hello-vulkan/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading