Skip to content

Commit ecec5bf

Browse files
committed
Revert "AGP 8, Java 17 an library updates"
This reverts commit 40b573f
1 parent 04fd6b1 commit ecec5bf

20 files changed

Lines changed: 607 additions & 83 deletions

File tree

.github/workflows/check.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ jobs:
1616
uses: actions/checkout@v2
1717
with:
1818
fetch-depth: 0
19-
- name: set up JDK 17
19+
- name: set up JDK 1.11
2020
uses: actions/setup-java@v1
2121
with:
22-
java-version: 17.02
22+
java-version: 1.11
2323
- name: Cache
2424
uses: actions/cache@v2
2525
with:

.github/workflows/release.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ jobs:
1414
with:
1515
fetch-depth: 0
1616
ref: refs/remotes/origin/master
17-
- name: set up JDK 17
17+
- name: set up JDK 1.11
1818
uses: actions/setup-java@v1
1919
with:
20-
java-version: 17.02
20+
java-version: 1.11
2121
- name: Cache
2222
uses: actions/cache@v2
2323
with:

.idea/compiler.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/kotlinc.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/misc.xml

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

androidcore/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@ android {
3535
}
3636
}
3737
compileOptions {
38-
sourceCompatibility JavaVersion.VERSION_17
39-
targetCompatibility JavaVersion.VERSION_17
38+
sourceCompatibility JavaVersion.VERSION_1_8
39+
targetCompatibility JavaVersion.VERSION_1_8
4040
coreLibraryDesugaringEnabled true
4141
}
4242
kotlinOptions {
43-
jvmTarget = '17'
43+
jvmTarget = '1.8'
4444
}
4545
buildFeatures {
4646
compose true

commonapi/build.gradle.kts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ kotlin {
6262
}
6363
}
6464
val androidMain by getting
65-
val androidUnitTest by getting
65+
val androidTest by getting
6666
val jsMain by getting
6767
val jsTest by getting
6868
}
@@ -85,8 +85,4 @@ android {
8585
targetSdk = androidTargetSdkVersion
8686
}
8787
namespace = "com.motorro.statemachine.commonapi"
88-
compileOptions {
89-
sourceCompatibility = JavaVersion.VERSION_17
90-
targetCompatibility = JavaVersion.VERSION_17
91-
}
9288
}

commoncore/build.gradle.kts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ kotlin {
6565
implementation(libs.timber)
6666
}
6767
}
68-
val androidUnitTest by getting
68+
val androidTest by getting
6969
val jsMain by getting
7070
val jsTest by getting
7171
}
@@ -88,8 +88,4 @@ android {
8888
targetSdk = androidTargetSdkVersion
8989
}
9090
namespace = "com.motorro.statemachine.commoncore"
91-
compileOptions {
92-
sourceCompatibility = JavaVersion.VERSION_17
93-
targetCompatibility = JavaVersion.VERSION_17
94-
}
9591
}

commonregister/build.gradle.kts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ kotlin {
6969
implementation(libs.timber)
7070
}
7171
}
72-
val androidUnitTest by getting
72+
val androidTest by getting
7373
val jsMain by getting
7474
val jsTest by getting
7575
}
@@ -92,8 +92,4 @@ android {
9292
targetSdk = androidTargetSdkVersion
9393
}
9494
namespace = "com.motorro.statemachine.commonregister"
95-
compileOptions {
96-
sourceCompatibility = JavaVersion.VERSION_17
97-
targetCompatibility = JavaVersion.VERSION_17
98-
}
9995
}

commonstatemachine/build.gradle.kts

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ kotlin {
3838

3939
jvm {
4040
compilations.all {
41-
kotlinOptions.jvmTarget = "17"
41+
kotlinOptions.jvmTarget = "1.8"
4242
}
4343
testRuns["test"].executionTask.configure {
4444
useJUnitPlatform()
@@ -88,7 +88,7 @@ kotlin {
8888
val androidMain by getting {
8989
dependsOn(jvmMain)
9090
}
91-
val androidUnitTest by getting {
91+
val androidTest by getting {
9292
dependsOn(commonTest)
9393
}
9494
val jsMain by getting
@@ -131,17 +131,6 @@ android {
131131
targetSdk = androidTargetSdkVersion
132132
}
133133
namespace = "com.motorro.commonstatemachine.commonstatemachine"
134-
compileOptions {
135-
sourceCompatibility = JavaVersion.VERSION_17
136-
targetCompatibility = JavaVersion.VERSION_17
137-
}
138-
139-
publishing {
140-
singleVariant("release") {
141-
withSourcesJar()
142-
withJavadocJar()
143-
}
144-
}
145134
}
146135
val dokkaHtml by tasks.getting(DokkaTask::class)
147136

0 commit comments

Comments
 (0)