Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump plugin android-build-gradle = "8.2.0" #2075

Merged
merged 2 commits into from
Dec 20, 2023
Merged

Bump plugin android-build-gradle = "8.2.0" #2075

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
960ac1c
Bump plugin android-build-gradle = "8.2.0"
soywiz Dec 19, 2023
8d2a83b
Use Java 17
soywiz Dec 20, 2023
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
2 changes: 1 addition & 1 deletion .github/workflows/DEPLOY.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ env:
ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.ORG_GRADLE_PROJECT_SIGNINGPASSWORD }}
SONATYPE_USERNAME: ${{ secrets.SONATYPEUSERNAME }}
SONATYPE_PASSWORD: ${{ secrets.SONATYPEPASSWORD }}
JAVA_VERSION: 11
JAVA_VERSION: 17
JAVA_DISTRIBUTION: zulu

jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/DEPLOY_ONLY_GRADLE_PLUGIN.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ env:
ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.ORG_GRADLE_PROJECT_SIGNINGPASSWORD }}
SONATYPE_USERNAME: ${{ secrets.SONATYPEUSERNAME }}
SONATYPE_PASSWORD: ${{ secrets.SONATYPEPASSWORD }}
JAVA_VERSION: 11
JAVA_VERSION: 17
JAVA_DISTRIBUTION: zulu

jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/FAKE_TESTDEPLOY.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ env:
ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.ORG_GRADLE_PROJECT_SIGNINGPASSWORD }}
SONATYPE_USERNAME: ${{ secrets.SONATYPEUSERNAME }}
SONATYPE_PASSWORD: ${{ secrets.SONATYPEPASSWORD }}
JAVA_VERSION: 11
JAVA_VERSION: 17
JAVA_DISTRIBUTION: zulu

jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/TEST.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ env:
CI: true
SKIP_KORGE_SAMPLES: true
DISPLAY: ":99"
JAVA_VERSION: 11
JAVA_VERSION: 17
JAVA_DISTRIBUTION: zulu
ENABLE_BENCHMARKS: false

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/TEST_SNAPSHOT.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ env:
# https://oss.sonatype.org/content/repositories/snapshots/org/jetbrains/kotlin/kotlin-compiler/
FORCED_KOTLIN_VERSION: "1.9.255-SNAPSHOT"
SKIP_KORGE_SAMPLES: true
JAVA_VERSION: 11
JAVA_VERSION: 17
JAVA_DISTRIBUTION: zulu

jobs:
Expand Down
8 changes: 7 additions & 1 deletion buildSrc/src/main/kotlin/korlibs/korge/gradle/targets/android/AndroidDirect.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ fun Project.configureAndroidDirect(projectType: ProjectType, isKorge: Boolean) {
setCompileSdkVersion(if (isKorge) project.korge.androidCompileSdk else project.getAndroidCompileSdkVersion())
//buildToolsVersion(project.findProperty("android.buildtools.version")?.toString() ?: "30.0.2")

(this as CommonExtension<*, *, *, *>).installation.apply {
(this as CommonExtension<*, *, *, *, *>).installation.apply {
// @TODO: Android Build Gradle newer version
installOptions("-r")
timeOutInMs = project.korge.androidTimeoutMs
Expand All @@ -83,6 +83,12 @@ fun Project.configureAndroidDirect(projectType: ProjectType, isKorge: Boolean) {
targetCompatibility = ANDROID_JAVA_VERSION
}

buildFeatures.apply {
if (project.name == "korge-foundation") {
buildConfig = true
}
}

packagingOptions.also {
for (pattern in when {
isKorge -> project.korge.androidExcludePatterns
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ org.gradle.daemon=true
# https://kotlinlang.org/docs/whatsnew17.html#a-new-approach-to-incremental-compilation
kotlin.incremental.useClasspathSnapshot=true

android.disableAutomaticComponentCreation=true
#android.disableAutomaticComponentCreation=true

#kotlin.build.report.output=file

Expand Down
3 changes: 2 additions & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,9 @@ node = "16.9.1"
#android-build-gradle = "7.4.2"
#android-build-gradle = "8.0.0"
#android-build-gradle = "7.4.0-beta02"
android-build-gradle = "7.3.1"
#android-build-gradle = "7.3.1"
#android-build-gradle = "8.1.0-alpha04"
android-build-gradle = "8.2.0"
gson = "2.10.1"
gradle-publish-plugin = "1.1.0"
#gradle-publish-plugin = "0.14.0"
Expand Down
Loading