Examples: Android+OpenGL3: update Gradle project (#8888, #8878)

This commit is contained in:
scribam
2025-08-16 18:34:02 +02:00
committed by ocornut
parent 86ec5c8342
commit 361e370fe0
6 changed files with 45 additions and 47 deletions

View File

@@ -43,6 +43,8 @@ Breaking Changes:
Other Changes: Other Changes:
- Examples: Android: Android+OpenGL3: update Gradle project (#8888, #8878) [@scribam]
----------------------------------------------------------------------- -----------------------------------------------------------------------
VERSION 1.92.2b (Released 2025-08-13) VERSION 1.92.2b (Released 2025-08-13)

View File

@@ -1,12 +1,14 @@
.cxx
.externalNativeBuild
build/ build/
*.iml *.iml
.idea
.gradle .gradle
.idea
.DS_Store
/captures
.externalNativeBuild
.cxx
local.properties local.properties
# Android Studio puts a Gradle wrapper here, that we don't want: # Android Studio puts a Gradle wrapper here, that we don't want:
gradle/ gradle/
!gradle/libs.versions.toml
gradlew* gradlew*

View File

@@ -1,16 +1,16 @@
apply plugin: 'com.android.application' plugins {
apply plugin: 'kotlin-android' alias(libs.plugins.android.application)
alias(libs.plugins.kotlin.android)
}
android { android {
compileSdkVersion 33 namespace 'imgui.example.android'
buildToolsVersion "33.0.2" compileSdk 36
ndkVersion "25.2.9519653"
defaultConfig { defaultConfig {
applicationId "imgui.example.android" applicationId "imgui.example.android"
namespace "imgui.example.android" minSdk 24
minSdkVersion 24 targetSdk 36
targetSdkVersion 33
versionCode 1 versionCode 1
versionName "1.0" versionName "1.0"
} }
@@ -21,26 +21,17 @@ android {
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt') proguardFiles getDefaultProguardFile('proguard-android-optimize.txt')
} }
} }
compileOptions { compileOptions {
sourceCompatibility JavaVersion.VERSION_11 sourceCompatibility JavaVersion.VERSION_11
targetCompatibility JavaVersion.VERSION_11 targetCompatibility JavaVersion.VERSION_11
} }
kotlinOptions { kotlinOptions {
jvmTarget="11" jvmTarget = '11'
} }
externalNativeBuild { externalNativeBuild {
cmake { cmake {
path "../../CMakeLists.txt" path file('../../CMakeLists.txt')
version '3.22.1' version '3.22.1'
} }
} }
} }
repositories {
mavenCentral()
}
dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
}

View File

@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"> <manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools">
<application <application
android:label="ImGuiExample" android:label="ImGuiExample"

View File

@@ -1,24 +1,5 @@
buildscript { // Top-level build file where you can add configuration options common to all sub-projects/modules.
ext.kotlin_version = '1.8.0' plugins {
repositories { alias(libs.plugins.android.application) apply false
google() alias(libs.plugins.kotlin.android) apply false
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:7.4.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}
allprojects {
repositories {
google()
mavenCentral()
}
}
task clean(type: Delete) {
delete rootProject.buildDir
} }

View File

@@ -1 +1,22 @@
pluginManagement {
repositories {
google {
content {
includeGroupByRegex("com\\.android.*")
includeGroupByRegex("com\\.google.*")
includeGroupByRegex("androidx.*")
}
}
mavenCentral()
gradlePluginPortal()
}
}
dependencyResolutionManagement {
repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
repositories {
google()
mavenCentral()
}
}
include ':app' include ':app'