Skip to content

Commit 2d15974

Browse files
Merge pull request #2 from gpx1000/for_sascha
bump versions for Android and fix a few things.
2 parents c022c3b + 5d43393 commit 2d15974

File tree

3 files changed

+16
-18
lines changed

3 files changed

+16
-18
lines changed

app/android/AndroidManifest.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
android:versionName="1.0">
2424

2525
<application android:label="@string/app_name"
26-
android:allowBackup="false"
2726
android:debuggable="true"
2827
android:icon="@mipmap/ic_launcher"
2928
android:roundIcon="@mipmap/ic_launcher_round"

bldsys/cmake/template/gradle/app.build.gradle.in

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,14 @@ ext.vvl_version='1.3.296.0'
66
apply from: "./download_vvl.gradle"
77

88
android {
9-
compileSdk 33
10-
buildToolsVersion '34.0.0'
11-
ndkVersion '27.0.12077973'
12-
namespace "com.khronos.vulkan_samples"
9+
ndkVersion '28.0.12433566 rc1'
10+
compileSdk 35
1311

1412
defaultConfig {
15-
applicationId "com.khronos.vulkan_samples"
13+
applicationId 'com.khronos.vulkan_samples'
14+
namespace "com.khronos.vulkan_samples"
1615
@MIN_SDK_VERSION@
17-
targetSdk 33
16+
targetSdk 35
1817
versionCode 1
1918
versionName "1.0"
2019

@@ -44,8 +43,8 @@ android {
4443
}
4544

4645
compileOptions {
47-
sourceCompatibility JavaVersion.VERSION_1_8
48-
targetCompatibility JavaVersion.VERSION_1_8
46+
sourceCompatibility JavaVersion.VERSION_21
47+
targetCompatibility JavaVersion.VERSION_21
4948
}
5049

5150
sourceSets {
@@ -77,9 +76,9 @@ android {
7776
}
7877

7978
dependencies {
80-
implementation 'androidx.appcompat:appcompat:1.6.1'
81-
implementation 'com.google.android.material:material:1.8.0'
82-
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
83-
implementation 'androidx.core:core:1.9.0'
84-
implementation 'androidx.games:games-activity:2.0.0'
79+
implementation 'androidx.appcompat:appcompat:1.7.0'
80+
implementation 'com.google.android.material:material:1.12.0'
81+
implementation 'androidx.constraintlayout:constraintlayout:2.2.0'
82+
implementation 'androidx.core:core:1.15.0'
83+
implementation 'androidx.games:games-activity:3.0.5'
8584
}
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
plugins {
2-
id 'com.android.application' version '8.7.0' apply false
3-
id 'com.android.library' version '8.7.0' apply false
2+
id 'com.android.application' version '8.7.2' apply false
3+
id 'com.android.library' version '8.7.2' apply false
44
}
55

6-
task clean(type: Delete) {
7-
delete rootProject.buildDir
6+
tasks.register('clean', Delete) {
7+
delete rootProject.layout.buildDirectory
88
}

0 commit comments

Comments
 (0)