Skip to content

Version bumps #18

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

Merged
merged 1 commit into from
Jan 11, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* @patjackson52 @mpetuska
10 changes: 0 additions & 10 deletions .github/dependabot.yml

This file was deleted.

4 changes: 2 additions & 2 deletions .github/workflows/check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
curl
mingw-w64-x86_64-curl

- uses: actions/checkout@v3.0.2
- uses: actions/checkout@v3

- uses: actions/setup-java@v3
with:
Expand All @@ -58,7 +58,7 @@ jobs:

- name: Restore Gradle cache
id: cache-gradle
uses: actions/cache@v3.0.5
uses: actions/cache@v3
with:
path: |
~/.gradle/caches
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:

- name: Restore Gradle cache
id: cache-gradle
uses: actions/cache@v3.0.5
uses: actions/cache@v3
with:
path: |
~/.gradle/caches
Expand Down Expand Up @@ -119,7 +119,7 @@ jobs:
mingw-w64-x86_64-curl
curl

- uses: actions/checkout@v3.0.2
- uses: actions/checkout@v3
if: ${{ matrix.repository.enabled == true }}

- uses: actions/setup-java@v3
Expand All @@ -131,7 +131,7 @@ jobs:
- name: Restore Gradle cache
if: ${{ matrix.repository.enabled == true }}
id: cache-gradle
uses: actions/cache@v3.0.5
uses: actions/cache@v3
with:
path: |
~/.gradle/caches
Expand Down Expand Up @@ -166,7 +166,7 @@ jobs:
echo "/${REPO_NAME} /${REPO_NAME}/${REPO_NAME}/index.html 301" > public/_redirects;
echo "/${REPO_NAME}/index.html /${REPO_NAME}/${REPO_NAME}/index.html 301" >> public/_redirects;

- uses: crazy-max/ghaction-github-pages@v3.0.0
- uses: crazy-max/ghaction-github-pages@v3
with:
target_branch: gh-pages
build_dir: public
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/resolve-version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ jobs:
sed -Ei "s|^(version=).*\$|\\1$SNAPSHOT_VERSION|" gradle.properties
- name: Commit and push SNAPSHOT
if: env.DIFF_VERSION == '1' && env.GRADLE_VERSION != env.SNAPSHOT_VERSION
uses: devops-infra/action-commit-push@v0.9.0
uses: devops-infra/action-commit-push@v0.9.2
with:
github_token: ${{ github.token }}
commit_message: '[ci skip] New SNAPSHOT - ${{ env.SNAPSHOT_VERSION }}'
4 changes: 2 additions & 2 deletions build-conventions/settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ pluginManagement {
}

plugins {
id("de.fayard.refreshVersions") version "0.40.2"
id("com.gradle.enterprise") version "3.10.3"
id("de.fayard.refreshVersions") version "0.51.0"
id("com.gradle.enterprise") version "3.12.2"
}

refreshVersions {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ plugins {
}

android {
compileSdk = 31
compileSdk = 32
defaultConfig {
minSdk = 21
targetSdk = 31
targetSdk = 32
// testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ kotlin {
browser {
testTask {
useKarma {
useFirefoxHeadless()
useChromiumHeadless()
}
}
}
Expand Down
4 changes: 3 additions & 1 deletion build-conventions/src/main/kotlin/util/gradle.kt
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,7 @@ fun execAndCapture(cmd: String): String? {
child.waitFor()
return if (child.exitValue() == 0) {
child.inputStream.readAllBytes().toString(Charset.defaultCharset()).trim()
} else null
} else {
null
}
}
5 changes: 5 additions & 0 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,10 @@ kotlin {
api("org.reduxkotlin:redux-kotlin:_")
}
}
named("commonTest") {
dependencies {
api("org.jetbrains.kotlinx:kotlinx-coroutines-test:_")
}
}
}
}
3 changes: 1 addition & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,9 @@ kotlin.js.generate.externals=false
kotlin.js.compiler=ir
kotlin.incremental.js=true
kotlin.mpp.stability.nowarn=true
kotlin.mpp.enableGranularSourceSetsMetadata=true
kotlin.native.enableDependencyPropagation=false
kotlin.native.ignoreDisabledTargets=true
android.useAndroidX=true
kotlin.js.browser.karma.browsers=chromium-headless
#======================================== GitHub ========================================
gh.owner.id=reduxkotlin
gh.owner.name=reduxkotlin.org
Expand Down
33 changes: 26 additions & 7 deletions gradle/versions.properties
Original file line number Diff line number Diff line change
@@ -1,27 +1,46 @@
#### Dependencies and Plugin versions with their available updates.
#### Generated by `./gradlew refreshVersions` version 0.40.2
#### Generated by `./gradlew refreshVersions` version 0.51.0
####
#### Don't manually edit or split the comments that start with four hashtags (####),
#### they will be overwritten by refreshVersions.
####
#### suppress inspection "SpellCheckingInspection" for whole file
#### suppress inspection "UnusedProperty" for whole file

#======================================= Plugins ========================================
plugin.android=7.2.2
version.org.jetbrains.compose..compose-gradle-plugin=1.1.1
plugin.android=7.3.1

version.kotlinx.coroutines=1.6.4

version.org.jetbrains.compose..compose-gradle-plugin=1.2.2

version.com.github.jakemarsden..git-hooks-gradle-plugin=0.0.2

version.gradle.plugin.com.github.jengelman.gradle.plugins..shadow=7.0.0

version.io.github.gradle-nexus..publish-plugin=1.1.0
version.detekt=1.21.0
version.klip=0.4.1
version.org.jetbrains.dokka..dokka-gradle-plugin=1.7.10

version.detekt=1.22.0

version.klip=0.4.1

version.org.jetbrains.dokka..dokka-gradle-plugin=1.7.20

#====================================== Libraries =======================================
version.androidx.compose=1.1.1

version.androidx.compose.material=1.1.1

version.androidx.compose.ui=1.1.1

version.androidx.test.espresso=3.4.0

version.androidx.test.rules=1.4.0

version.androidx.test.runner=1.4.0

version.kotlinx.serialization=1.3.3
version.kotlin=1.6.10

version.kotlin=1.7.20

version.org.reduxkotlin..redux-kotlin=0.5.5
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading