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

Bump the versions group with 5 updates #7

Merged
merged 12 commits into from
Jun 18, 2024
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
5 changes: 0 additions & 5 deletions .github/workflows/build-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,3 @@ jobs:
KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
STORE_PASSWORD: ${{ secrets.STORE_PASSWORD }}
KEYSTORE_BASE64: ${{ secrets.KEYSTORE_BASE64 }}
GSERVICES_BASE64: ${{ secrets.GSERVICES_BASE64 }}
ACTIVITY_AD_UNIT_ID: ${{ secrets.ACTIVITY_AD_UNIT_ID }}
BANNER_AD_UNIT_ID: ${{ secrets.BANNER_AD_UNIT_ID }}
INTERSITIAL_AD_UNIT_ID: ${{ secrets.INTERSITIAL_AD_UNIT_ID }}
WEB_CLIENT_ID: ${{ secrets.WEB_CLIENT_ID }}
8 changes: 4 additions & 4 deletions .github/workflows/call-create-artifacts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,21 +22,21 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout Git repo
uses: actions/checkout@v2
uses: actions/checkout@v4
- uses: christian-draeger/[email protected]
id: properties
with:
path: './gradle.properties'
properties: 'makeevrserg.project.name makeevrserg.project.version.string'
- name: Set up JDK 17
uses: actions/setup-java@v2
uses: actions/setup-java@v4
with:
distribution: 'adopt'
java-version: 17
- name: Give gradle permission
run: chmod +x gradlew
- name: Build with Gradle android
uses: gradle/gradle-build-action@v2
uses: gradle/gradle-build-action@v3
env:
KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
Expand All @@ -46,7 +46,7 @@ jobs:
arguments: :instances:androidApp:assembleRelease --stacktrace
- name: Create release
id: create_internal_release
uses: softprops/action-gh-release@v1
uses: softprops/action-gh-release@v2
env:
GITHUB_TOKEN: ${{ secrets.ACTIONS_TOKEN }}
with:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/call-detekt-validation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@ jobs:
name: "Check project by detekt"
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
name: "Checkout"
- name: "Set up JDK 1.17"
uses: actions/setup-java@v2
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '17'
- name: "Give gradle permission"
run: chmod +x gradlew
- name: detekt
uses: gradle/gradle-build-action@v2
uses: gradle/gradle-build-action@v3
with:
arguments: detekt
4 changes: 2 additions & 2 deletions .github/workflows/call-gradle-wrapper-validation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ jobs:
name: "Gradle Wrapper Validation"
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
name: "Checkout"
- name: "Validate Gradle Wrapper"
uses: gradle/wrapper-validation-action@v1
uses: gradle/wrapper-validation-action@v3
6 changes: 3 additions & 3 deletions .github/workflows/call-tests-validation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@ jobs:
name: "Run tests"
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
name: "Checkout"
- name: "Set up JDK 1.17"
uses: actions/setup-java@v2
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '17'
- name: "Give gradle permission"
run: chmod +x gradlew
- name: "Run tests"
uses: gradle/gradle-build-action@v2
uses: gradle/gradle-build-action@v3
with:
arguments: test
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ makeevrserg.android.sdk.target=34
# Project
makeevrserg.project.name=ApplicationTemplate
makeevrserg.project.group=com.makeevrserg.applicationtemplate
makeevrserg.project.version.string=1.2.0
makeevrserg.project.version.code=12
makeevrserg.project.version.string=1.2.2
makeevrserg.project.version.code=14
makeevrserg.project.description=Template for KMP applcation
makeevrserg.project.developers=makeevrserg|Makeev Roman|[email protected]
makeevrserg.project.url=https://github.com/makeevrserg/KMP-Template
Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ ktor = "2.3.11" # https://github.com/ktorio/ktor

# klibs
klibs-mikro = "1.8.4" # https://github.com/makeevrserg/klibs.mikro
klibs-kstorage = "2.1.0" # https://github.com/makeevrserg/klibs.kstorage
klibs-kstorage = "2.2.0" # https://github.com/makeevrserg/klibs.kstorage
klibs-kdi = "1.4.5" # https://github.com/makeevrserg/KDI

# Compose
Expand Down
2 changes: 1 addition & 1 deletion modules/features/root/impl/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -74,5 +74,5 @@ dependencies {
implementation(libs.klibs.kstorage)
implementation(libs.google.auth)
implementation(libs.kotlin.coroutines.playServices)
implementation("io.ktor:ktor-client-logging-jvm:2.3.2")
implementation("io.ktor:ktor-client-logging-jvm:2.3.11")
}
Loading