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.

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

TECH: deleted target 17 #637

Merged
merged 27 commits into from
Feb 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
ff40a1c
TECH: deleted target 17
AzamatCherchesov Feb 21, 2024
254054d
TECH: deleted target 17
AzamatCherchesov Feb 21, 2024
4d74994
TECH: deleted target 17
AzamatCherchesov Feb 21, 2024
6f37844
TECH: deleted target 17
AzamatCherchesov Feb 21, 2024
aff2f55
TECH: deleted target 17
AzamatCherchesov Feb 21, 2024
5335d1c
TECH: deleted target 17
AzamatCherchesov Feb 21, 2024
e5f2396
TECH: deleted target 17
AzamatCherchesov Feb 21, 2024
aebd49c
TECH: deleted target 17
AzamatCherchesov Feb 21, 2024
08a608e
TECH: deleted target 17
AzamatCherchesov Feb 21, 2024
0ffd23e
TECH: deleted target 17
AzamatCherchesov Feb 21, 2024
985f129
TECH: deleted target 17
AzamatCherchesov Feb 21, 2024
fcbb279
TECH: deleted target 17
AzamatCherchesov Feb 21, 2024
45096da
TECH: deleted target 17
AzamatCherchesov Feb 21, 2024
4fdd1a8
TECH: deleted target 17
AzamatCherchesov Feb 21, 2024
96f5c85
TECH: deleted target 17
AzamatCherchesov Feb 21, 2024
871b083
TECH: deleted target 17
AzamatCherchesov Feb 21, 2024
667eb7a
TECH: deleted target 17
AzamatCherchesov Feb 21, 2024
edc08a1
TECH: deleted target 17
AzamatCherchesov Feb 21, 2024
7349ace
TECH: deleted target 17
AzamatCherchesov Feb 21, 2024
e653e47
TECH: deleted target 17
AzamatCherchesov Feb 21, 2024
5f99d54
TECH: deleted target 17
AzamatCherchesov Feb 21, 2024
d2761e7
TECH: deleted target 17
AzamatCherchesov Feb 21, 2024
8114cba
TECH: deleted target 17
AzamatCherchesov Feb 21, 2024
02bb523
TECH: deleted target 17
AzamatCherchesov Feb 21, 2024
8f94d60
TECH: deleted target 17
AzamatCherchesov Feb 21, 2024
b035320
TECH: deleted target 17
AzamatCherchesov Feb 22, 2024
b9931a0
TECH: deleted target 17
AzamatCherchesov Feb 22, 2024
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
5 changes: 5 additions & 0 deletions .github/workflows/tutorial.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,11 @@ jobs:
- uses: actions/setup-python@v2
with:
python-version: 3.x
- name: Set up JDK
uses: actions/setup-java@v2
with:
distribution: 'adopt'
java-version: 17
- run: pip install mkdocs-material
- run: pip install mkdocs-static-i18n==0.56
- run: mkdocs gh-deploy --force
Binary file modified artifacts/adbserver-desktop.jar
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ plugins {

android {
compileOptions {
targetCompatibility = JavaVersion.VERSION_17
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_1_8
sourceCompatibility = JavaVersion.VERSION_1_8
}

testBuildType = "debug"
Expand All @@ -35,14 +35,10 @@ android {
buildFeatures {
viewBinding = true // for the samples
}

kotlin {
jvmToolchain(JavaVersion.VERSION_17.majorVersion.toInt())
}
}

tasks.withType<KotlinCompile>().configureEach {
kotlinOptions {
jvmTarget = JavaVersion.VERSION_17.toString()
jvmTarget = JavaVersion.VERSION_1_8.toString()
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ configure<BaseExtension> {
compileSdkVersion(34)

compileOptions {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}

defaultConfig {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ android {
}

compileOptions {
targetCompatibility = JavaVersion.VERSION_17
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_1_8
sourceCompatibility = JavaVersion.VERSION_1_8
}
}

tasks.withType<KotlinCompile>().configureEach {
kotlinOptions {
jvmTarget = JavaVersion.VERSION_17.toString()
jvmTarget = JavaVersion.VERSION_1_8.toString()
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ val kotlinLanguageVersion = "1.8"
tasks.withType<KotlinCompile>().configureEach {
kotlinOptions {

jvmTarget = JavaVersion.VERSION_11.toString()
jvmTarget = JavaVersion.VERSION_1_8.toString()

// TODO: fix all warnings before
// allWarningsAsErrors = true
Expand All @@ -21,6 +21,6 @@ tasks.withType<KotlinCompile>().configureEach {
}

tasks.withType<JavaCompile>().configureEach {
sourceCompatibility = JavaVersion.VERSION_11.toString()
targetCompatibility = JavaVersion.VERSION_11.toString()
sourceCompatibility = JavaVersion.VERSION_1_8.toString()
targetCompatibility = JavaVersion.VERSION_1_8.toString()
}
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@ signing {
useInMemoryPgpKeys(signingKeyId, signingKey, signingPassword)
}

//tasks.withType<Sign>().configureEach {
// tasks.withType<Sign>().configureEach {
// onlyIf {
// val isReleaseQueued = gradle.taskGraph.hasTask("publishAllPublicationsTo${sonatypeReleasesRepoName}Repository")
// val isSnapshotQueued = gradle.taskGraph.hasTask("publishAllPublicationsTo${sonatypeSnapshotsRepoName}Repository")
// isReleaseQueued || isSnapshotQueued
// }
//}
// }
4 changes: 4 additions & 0 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ pluginManagement {
}
}

plugins {
id("org.gradle.toolchains.foojay-resolver-convention") version "0.4.0"
}

dependencyResolutionManagement {
@Suppress("UnstableApiUsage")
repositories {
Expand Down
6 changes: 6 additions & 0 deletions tutorial/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,12 @@ android {
testOptions {
execution = "ANDROIDX_TEST_ORCHESTRATOR"
}

java {
toolchain {
languageVersion.set(JavaLanguageVersion.of(8))
}
}
}

dependencies {
Expand Down
Loading