mirror of
https://github.com/Relintai/pandemonium_engine.git
synced 2024-12-24 12:47:12 +01:00
Ported: Ensure Android Java and Kotlin compile to the same version - madmiraal
9f0dba8b65
This commit is contained in:
parent
745bdcb4c9
commit
b829fff345
@ -2,8 +2,6 @@
|
|||||||
//
|
//
|
||||||
// Do not remove/modify comments ending with BEGIN/END, they are used to inject
|
// Do not remove/modify comments ending with BEGIN/END, they are used to inject
|
||||||
// addon-specific configuration.
|
// addon-specific configuration.
|
||||||
apply from: 'config.gradle'
|
|
||||||
|
|
||||||
buildscript {
|
buildscript {
|
||||||
apply from: 'config.gradle'
|
apply from: 'config.gradle'
|
||||||
|
|
||||||
@ -21,7 +19,12 @@ buildscript {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
apply plugin: 'com.android.application'
|
plugins {
|
||||||
|
id 'com.android.application'
|
||||||
|
id 'org.jetbrains.kotlin.android'
|
||||||
|
}
|
||||||
|
|
||||||
|
apply from: 'config.gradle'
|
||||||
|
|
||||||
allprojects {
|
allprojects {
|
||||||
repositories {
|
repositories {
|
||||||
@ -91,6 +94,10 @@ android {
|
|||||||
targetCompatibility versions.javaVersion
|
targetCompatibility versions.javaVersion
|
||||||
}
|
}
|
||||||
|
|
||||||
|
kotlinOptions {
|
||||||
|
jvmTarget = versions.javaVersion
|
||||||
|
}
|
||||||
|
|
||||||
assetPacks = [":assetPacks:installTime"]
|
assetPacks = [":assetPacks:installTime"]
|
||||||
|
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
|
@ -4,8 +4,9 @@ ext.versions = [
|
|||||||
minSdk : 19, // Also update 'platform/android/java/lib/AndroidManifest.xml#minSdkVersion' & 'platform/android/export/export_plugin.cpp#DEFAULT_MIN_SDK_VERSION'
|
minSdk : 19, // Also update 'platform/android/java/lib/AndroidManifest.xml#minSdkVersion' & 'platform/android/export/export_plugin.cpp#DEFAULT_MIN_SDK_VERSION'
|
||||||
targetSdk : 30, // Also update 'platform/android/java/lib/AndroidManifest.xml#targetSdkVersion' & 'platform/android/export/export_plugin.cpp#DEFAULT_TARGET_SDK_VERSION'
|
targetSdk : 30, // Also update 'platform/android/java/lib/AndroidManifest.xml#targetSdkVersion' & 'platform/android/export/export_plugin.cpp#DEFAULT_TARGET_SDK_VERSION'
|
||||||
buildTools : '30.0.3',
|
buildTools : '30.0.3',
|
||||||
kotlinVersion : '1.5.10',
|
kotlinVersion : '1.6.21',
|
||||||
fragmentVersion : '1.3.6',
|
fragmentVersion : '1.3.6',
|
||||||
|
nexusPublishVersion: '1.1.0',
|
||||||
javaVersion : 11,
|
javaVersion : 11,
|
||||||
ndkVersion : '21.4.7075529' // Also update 'platform/android/detect.py#get_project_ndk_version()' when this is updated.
|
ndkVersion : '21.4.7075529' // Also update 'platform/android/detect.py#get_project_ndk_version()' when this is updated.
|
||||||
|
|
||||||
@ -14,7 +15,7 @@ ext.versions = [
|
|||||||
ext.libraries = [
|
ext.libraries = [
|
||||||
androidGradlePlugin: "com.android.tools.build:gradle:$versions.androidGradlePlugin",
|
androidGradlePlugin: "com.android.tools.build:gradle:$versions.androidGradlePlugin",
|
||||||
kotlinGradlePlugin : "org.jetbrains.kotlin:kotlin-gradle-plugin:$versions.kotlinVersion",
|
kotlinGradlePlugin : "org.jetbrains.kotlin:kotlin-gradle-plugin:$versions.kotlinVersion",
|
||||||
kotlinStdLib : "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$versions.kotlinVersion",
|
kotlinStdLib : "org.jetbrains.kotlin:kotlin-stdlib:$versions.kotlinVersion",
|
||||||
androidxFragment : "androidx.fragment:fragment:$versions.fragmentVersion",
|
androidxFragment : "androidx.fragment:fragment:$versions.fragmentVersion",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
@ -1,2 +1,15 @@
|
|||||||
// This is the root directory of the Pandemonium custom build.
|
// This is the root directory of the Pandemonium custom build.
|
||||||
|
pluginManagement {
|
||||||
|
apply from: 'config.gradle'
|
||||||
|
|
||||||
|
plugins {
|
||||||
|
id 'com.android.application' version versions.androidGradlePlugin
|
||||||
|
id 'org.jetbrains.kotlin.android' version versions.kotlinVersion
|
||||||
|
}
|
||||||
|
repositories {
|
||||||
|
gradlePluginPortal()
|
||||||
|
google()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
include ':assetPacks:installTime'
|
include ':assetPacks:installTime'
|
||||||
|
@ -1,4 +1,3 @@
|
|||||||
apply from: 'app/config.gradle'
|
|
||||||
|
|
||||||
buildscript {
|
buildscript {
|
||||||
apply from: 'app/config.gradle'
|
apply from: 'app/config.gradle'
|
||||||
@ -13,6 +12,13 @@ buildscript {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
plugins {
|
||||||
|
id 'io.github.gradle-nexus.publish-plugin'
|
||||||
|
}
|
||||||
|
|
||||||
|
apply from: 'app/config.gradle'
|
||||||
|
apply from: 'scripts/publish-root.gradle'
|
||||||
|
|
||||||
allprojects {
|
allprojects {
|
||||||
repositories {
|
repositories {
|
||||||
google()
|
google()
|
||||||
|
@ -1,5 +1,8 @@
|
|||||||
// Gradle build config for Pandemonium Engine's Android port.
|
// Gradle build config for Pandemonium Engine's Android port.
|
||||||
apply plugin: 'com.android.application'
|
plugins {
|
||||||
|
id 'com.android.application'
|
||||||
|
id 'org.jetbrains.kotlin.android'
|
||||||
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
implementation libraries.kotlinStdLib
|
implementation libraries.kotlinStdLib
|
||||||
@ -30,6 +33,10 @@ android {
|
|||||||
targetCompatibility versions.javaVersion
|
targetCompatibility versions.javaVersion
|
||||||
}
|
}
|
||||||
|
|
||||||
|
kotlinOptions {
|
||||||
|
jvmTarget = versions.javaVersion
|
||||||
|
}
|
||||||
|
|
||||||
buildTypes {
|
buildTypes {
|
||||||
dev {
|
dev {
|
||||||
initWith debug
|
initWith debug
|
||||||
|
@ -1,5 +1,7 @@
|
|||||||
apply plugin: 'com.android.library'
|
plugins {
|
||||||
apply plugin: 'kotlin-android'
|
id 'com.android.library'
|
||||||
|
id 'org.jetbrains.kotlin.android'
|
||||||
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
implementation libraries.kotlinStdLib
|
implementation libraries.kotlinStdLib
|
||||||
@ -25,6 +27,10 @@ android {
|
|||||||
targetCompatibility versions.javaVersion
|
targetCompatibility versions.javaVersion
|
||||||
}
|
}
|
||||||
|
|
||||||
|
kotlinOptions {
|
||||||
|
jvmTarget = versions.javaVersion
|
||||||
|
}
|
||||||
|
|
||||||
buildTypes {
|
buildTypes {
|
||||||
dev {
|
dev {
|
||||||
initWith debug
|
initWith debug
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
// Non functional android library used to provide Android Studio editor support to the project.
|
// Non functional android library used to provide Android Studio editor support to the project.
|
||||||
plugins {
|
plugins {
|
||||||
id 'com.android.library'
|
id 'com.android.library'
|
||||||
|
id 'org.jetbrains.kotlin.android'
|
||||||
}
|
}
|
||||||
|
|
||||||
android {
|
android {
|
||||||
@ -18,6 +19,10 @@ android {
|
|||||||
targetCompatibility versions.javaVersion
|
targetCompatibility versions.javaVersion
|
||||||
}
|
}
|
||||||
|
|
||||||
|
kotlinOptions {
|
||||||
|
jvmTarget = versions.javaVersion
|
||||||
|
}
|
||||||
|
|
||||||
packagingOptions {
|
packagingOptions {
|
||||||
exclude 'META-INF/LICENSE'
|
exclude 'META-INF/LICENSE'
|
||||||
exclude 'META-INF/NOTICE'
|
exclude 'META-INF/NOTICE'
|
||||||
|
@ -1,4 +1,19 @@
|
|||||||
// Configure the root project.
|
// Configure the root project.
|
||||||
|
pluginManagement {
|
||||||
|
apply from: 'app/config.gradle'
|
||||||
|
|
||||||
|
plugins {
|
||||||
|
id 'com.android.application' version versions.androidGradlePlugin
|
||||||
|
id 'com.android.library' version versions.androidGradlePlugin
|
||||||
|
id 'org.jetbrains.kotlin.android' version versions.kotlinVersion
|
||||||
|
id 'io.github.gradle-nexus.publish-plugin' version versions.nexusPublishVersion
|
||||||
|
}
|
||||||
|
repositories {
|
||||||
|
gradlePluginPortal()
|
||||||
|
google()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
rootProject.name = "Pandemonium"
|
rootProject.name = "Pandemonium"
|
||||||
|
|
||||||
include ':app'
|
include ':app'
|
||||||
|
Loading…
Reference in New Issue
Block a user