Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
28 changes: 16 additions & 12 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ plugins {

android {
namespace = "com.example.wgpuapplication"
compileSdk = 34
compileSdk = 36
ndkVersion = localProperties.getProperty("ndkVersion")

defaultConfig {
applicationId = "com.example.wgpuapplication"
minSdk = 24
targetSdk = 34
targetSdk = 36
versionCode = 1
versionName = "1.0"

Expand All @@ -38,11 +38,8 @@ android {
}
}
compileOptions {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}
kotlinOptions {
jvmTarget = "1.8"
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}
buildFeatures {
viewBinding = true
Expand All @@ -57,7 +54,14 @@ android {
}
}

kotlin {
compilerOptions {
jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17)
}
}

cargo {
pythonCommand = "python3"
module = "../lib"
libname = "wgpu_android_lib"
targets = listOf("x86_64", "x86", "arm", "arm64")
Expand All @@ -70,10 +74,10 @@ tasks.whenTaskAdded {
}

dependencies {
implementation("androidx.core:core-ktx:1.12.0")
implementation("androidx.games:games-activity:1.1.0")
implementation("androidx.appcompat:appcompat:1.6.1")
implementation("androidx.core:core-ktx:1.17.0")
implementation("androidx.games:games-activity:4.4.0")
implementation("androidx.appcompat:appcompat:1.8.0")
testImplementation("junit:junit:4.13.2")
androidTestImplementation("androidx.test.ext:junit:1.1.5")
androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
androidTestImplementation("androidx.test.ext:junit:1.3.0")
androidTestImplementation("androidx.test.espresso:espresso-core:3.7.0")
}
6 changes: 3 additions & 3 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
plugins {
id("com.android.application") version "8.2.1" apply false
id("org.jetbrains.kotlin.android") version "1.9.0" apply false
id("org.mozilla.rust-android-gradle.rust-android") version "0.9.3" apply false
id("com.android.application") version "8.13.2" apply false
id("org.jetbrains.kotlin.android") version "2.4.10" apply false
id("org.mozilla.rust-android-gradle.rust-android") version "0.9.6" apply false
}
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Sat Oct 07 22:39:10 ICT 2023
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.4-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading