yuzu-emu
/
yuzu-mainline
Archived
1
0
Fork 0

android: Enable Kotlin support

This commit is contained in:
Charles Lombardo 2023-03-06 02:01:37 -05:00 committed by bunnei
parent 96ea063b45
commit 834d53fbbf
4 changed files with 30 additions and 26 deletions

View File

@ -1,4 +1,7 @@
apply plugin: 'com.android.application' plugins {
id 'com.android.application'
id 'org.jetbrains.kotlin.android'
}
/** /**
* Use the number of seconds/10 since Jan 1 2016 as the versionCode. * Use the number of seconds/10 since Jan 1 2016 as the versionCode.
@ -20,6 +23,10 @@ android {
targetCompatibility JavaVersion.VERSION_11 targetCompatibility JavaVersion.VERSION_11
} }
kotlinOptions {
jvmTarget = '11'
}
lint { lint {
// This is important as it will run lint but not abort on error // This is important as it will run lint but not abort on error
// Lint has some overly obnoxious "errors" that should really be warnings // Lint has some overly obnoxious "errors" that should really be warnings
@ -115,6 +122,7 @@ android {
} }
dependencies { dependencies {
implementation 'androidx.core:core-ktx:1.9.0'
implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.appcompat:appcompat:1.6.1'
implementation 'androidx.exifinterface:exifinterface:1.3.6' implementation 'androidx.exifinterface:exifinterface:1.3.6'
implementation 'androidx.cardview:cardview:1.0.0' implementation 'androidx.cardview:cardview:1.0.0'

View File

@ -1,24 +1,8 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules. // Top-level build file where you can add configuration options common to all sub-projects/modules.
plugins {
buildscript { id 'com.android.application' version '7.4.2' apply false
id 'com.android.library' version '7.4.2' apply false
repositories { id 'org.jetbrains.kotlin.android' version '1.8.10' apply false
google()
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:7.4.2'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
}
}
allprojects {
repositories {
google()
jcenter()
}
} }
task clean(type: Delete) { task clean(type: Delete) {

View File

@ -8,8 +8,6 @@
# The setting is particularly useful for tweaking memory settings. # The setting is particularly useful for tweaking memory settings.
android.enableJetifier=true android.enableJetifier=true
android.useAndroidX=true android.useAndroidX=true
org.gradle.jvmargs=-Xmx1536m org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
# When configured, Gradle will run in incubating parallel mode. # Kotlin code style for this project: "official" or "obsolete":
# This option should only be used with decoupled projects. More details, visit kotlin.code.style=official
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true

View File

@ -1 +1,15 @@
pluginManagement {
repositories {
gradlePluginPortal()
google()
mavenCentral()
}
}
dependencyResolutionManagement {
repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
repositories {
google()
mavenCentral()
}
}
include ':app' include ':app'