Skip to content

Commit 92f8a47

Browse files
committed
Version bumps
1 parent 50765e6 commit 92f8a47

File tree

15 files changed

+245
-334
lines changed

15 files changed

+245
-334
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
* @patjackson52 @mpetuska

.github/dependabot.yml

Lines changed: 0 additions & 10 deletions
This file was deleted.

.github/workflows/check.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
curl
5050
mingw-w64-x86_64-curl
5151
52-
- uses: actions/checkout@v3.0.2
52+
- uses: actions/checkout@v3
5353

5454
- uses: actions/setup-java@v3
5555
with:
@@ -58,7 +58,7 @@ jobs:
5858

5959
- name: Restore Gradle cache
6060
id: cache-gradle
61-
uses: actions/cache@v3.0.5
61+
uses: actions/cache@v3
6262
with:
6363
path: |
6464
~/.gradle/caches

.github/workflows/release.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353

5454
- name: Restore Gradle cache
5555
id: cache-gradle
56-
uses: actions/cache@v3.0.5
56+
uses: actions/cache@v3
5757
with:
5858
path: |
5959
~/.gradle/caches
@@ -119,7 +119,7 @@ jobs:
119119
mingw-w64-x86_64-curl
120120
curl
121121
122-
- uses: actions/checkout@v3.0.2
122+
- uses: actions/checkout@v3
123123
if: ${{ matrix.repository.enabled == true }}
124124

125125
- uses: actions/setup-java@v3
@@ -131,7 +131,7 @@ jobs:
131131
- name: Restore Gradle cache
132132
if: ${{ matrix.repository.enabled == true }}
133133
id: cache-gradle
134-
uses: actions/cache@v3.0.5
134+
uses: actions/cache@v3
135135
with:
136136
path: |
137137
~/.gradle/caches
@@ -166,7 +166,7 @@ jobs:
166166
echo "/${REPO_NAME} /${REPO_NAME}/${REPO_NAME}/index.html 301" > public/_redirects;
167167
echo "/${REPO_NAME}/index.html /${REPO_NAME}/${REPO_NAME}/index.html 301" >> public/_redirects;
168168
169-
- uses: crazy-max/ghaction-github-pages@v3.0.0
169+
- uses: crazy-max/ghaction-github-pages@v3
170170
with:
171171
target_branch: gh-pages
172172
build_dir: public

.github/workflows/resolve-version.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
sed -Ei "s|^(version=).*\$|\\1$SNAPSHOT_VERSION|" gradle.properties
6161
- name: Commit and push SNAPSHOT
6262
if: env.DIFF_VERSION == '1' && env.GRADLE_VERSION != env.SNAPSHOT_VERSION
63-
uses: devops-infra/action-commit-push@v0.9.0
63+
uses: devops-infra/action-commit-push@v0.9.2
6464
with:
6565
github_token: ${{ github.token }}
6666
commit_message: '[ci skip] New SNAPSHOT - ${{ env.SNAPSHOT_VERSION }}'

build-conventions/settings.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ pluginManagement {
77
}
88

99
plugins {
10-
id("de.fayard.refreshVersions") version "0.40.2"
11-
id("com.gradle.enterprise") version "3.10.3"
10+
id("de.fayard.refreshVersions") version "0.51.0"
11+
id("com.gradle.enterprise") version "3.12.2"
1212
}
1313

1414
refreshVersions {

build-conventions/src/main/kotlin/convention.library-android.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ plugins {
44
}
55

66
android {
7-
compileSdk = 31
7+
compileSdk = 32
88
defaultConfig {
99
minSdk = 21
10-
targetSdk = 31
10+
targetSdk = 32
1111
// testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
1212
}
1313
}

build-conventions/src/main/kotlin/convention.mpp.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ kotlin {
1010
browser {
1111
testTask {
1212
useKarma {
13-
useFirefoxHeadless()
13+
useChromiumHeadless()
1414
}
1515
}
1616
}

build-conventions/src/main/kotlin/util/gradle.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,7 @@ fun execAndCapture(cmd: String): String? {
1111
child.waitFor()
1212
return if (child.exitValue() == 0) {
1313
child.inputStream.readAllBytes().toString(Charset.defaultCharset()).trim()
14-
} else null
14+
} else {
15+
null
16+
}
1517
}

build.gradle.kts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,10 @@ kotlin {
1919
api("org.reduxkotlin:redux-kotlin:_")
2020
}
2121
}
22+
named("commonTest") {
23+
dependencies {
24+
api("org.jetbrains.kotlinx:kotlinx-coroutines-test:_")
25+
}
26+
}
2227
}
2328
}

0 commit comments

Comments
 (0)