Skip to content

Commit

Permalink
Merge pull request #70 from CanerKaraca23/update
Browse files Browse the repository at this point in the history
Update Dependencies
  • Loading branch information
skydoves authored Aug 20, 2024
2 parents 62cf783 + 4879ee5 commit c9544e8
Show file tree
Hide file tree
Showing 9 changed files with 79 additions and 63 deletions.
10 changes: 10 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
version: 2
updates:
- package-ecosystem: github-actions
directory: /
schedule:
interval: daily
- package-ecosystem: gradle
directory: /
schedule:
interval: daily
67 changes: 33 additions & 34 deletions .github/workflows/android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,57 +8,56 @@ on:

jobs:
lint:
name: Spotless check
name: Spotless Check
runs-on: ubuntu-latest
steps:
- name: Check out code
uses: actions/[email protected]
- name: Set up JDK
uses: actions/[email protected]
- name: Checkout Code
uses: actions/checkout@v4

- name: Setup JDK
uses: actions/setup-java@v4
with:
distribution: adopt
java-version: 17
- name: spotless
distribution: temurin
java-version: 21

- name: Spotless
run: ./gradlew spotlessCheck

api_check:
name: API check
name: API Check
runs-on: ubuntu-latest
steps:
- name: Check out code
uses: actions/[email protected]
- name: Set up JDK
uses: actions/[email protected]
- name: Checkout Code
uses: actions/checkout@v4

- name: Setup JDK
uses: actions/setup-java@v4
with:
distribution: adopt
java-version: 17
- name: API check
distribution: temurin
java-version: 21

- name: API Check
run: ./gradlew apiCheck

build:
runs-on: ubuntu-latest
steps:
- uses: actions/[email protected]
- name: Checkout Code
uses: actions/checkout@v4

- name: set up JDK
uses: actions/setup-java@v3.5.1
- name: Setup JDK
uses: actions/setup-java@v4
with:
distribution: adopt
java-version: 17
distribution: temurin
java-version: 21

- name: Cache Gradle and wrapper
uses: actions/cache@v3
with:
path: |
~/.gradle/caches
~/.gradle/wrapper
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}
restore-keys: |
${{ runner.os }}-gradle-
- name: Make Gradle executable
run: chmod +x ./gradlew
- name: Setup Gradle
uses: gradle/actions/setup-gradle@v4

- name: Grant Execute Permission for gradlew
run: chmod +x gradlew

- name: Build with Gradle
- name: Build With Gradle
run: |
./gradlew --scan --stacktrace \
assemble -x :benchmark:pixel6api31Setup -x :benchmark:pixel6api31NonMinifiedReleaseAndroidTest -x :benchmark:collectNonMinifiedReleaseBaselineProfile
assemble -x :benchmark:pixel6api31Setup -x :benchmark:pixel6api31NonMinifiedReleaseAndroidTest -x :benchmark:collectNonMinifiedReleaseBaselineProfile
16 changes: 9 additions & 7 deletions .github/workflows/baseline-profile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,20 +35,22 @@ jobs:
steps:

# Checks your code out on the machine
- uses: actions/checkout@v3
- name: Checkout Code
uses: actions/checkout@v4

# Sets java up
- uses: actions/setup-java@v3
- name: Setup JDK
uses: actions/setup-java@v4
with:
distribution: temurin
java-version: 17
java-version: 21

# Sets gradle up
- name: Setup Gradle
uses: gradle/[email protected]
uses: gradle/actions/setup-gradle@v4

# Grants execute permission to gradle (safety step)
- name: Grant Permissions to gradlew
- name: Grant Execute Permission for gradlew
run: chmod +x gradlew

# This allows us to build most of what we need without the emulator running
Expand All @@ -66,10 +68,10 @@ jobs:

# Create Pull Request
- name: Create Pull Request
uses: peter-evans/create-pull-request@v5
uses: peter-evans/create-pull-request@v6
with:
commit-message: "Generate baseline profiles"
title: "Generate baseline profiles"
delete-branch: true
reviewers: skydoves
branch: actions/baseline-profiles
branch: actions/baseline-profiles
20 changes: 10 additions & 10 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,22 +7,22 @@ on:

jobs:
publish:
name: Snapshot build and publish
name: Snapshot Build and Publish
runs-on: macos-latest
steps:
- name: Check out code
uses: actions/checkout@v3.1.0
- name: Checkout Code
uses: actions/checkout@v4

- name: Set up JDK 17
uses: actions/setup-java@v3.5.1
- name: Setup JDK 17
uses: actions/setup-java@v4
with:
distribution: 'zulu'
java-version: 17
distribution: temurin
java-version: 21

- name: Grant Permission to Execute Gradle
- name: Grant Execute Permission for gradlew
run: chmod +x gradlew

- name: Release build
- name: Release Build
run: ./gradlew assemble --scan -x :benchmark:pixel6api31Setup -x :benchmark:pixel6api31NonMinifiedReleaseAndroidTest -x :benchmark:collectNonMinifiedReleaseBaselineProfile

- name: Publish to MavenCentral
Expand All @@ -33,4 +33,4 @@ jobs:
ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.OSSRH_PASSWORD }}
ORG_GRADLE_PROJECT_signingInMemoryKeyId: ${{ secrets.SIGNING_KEY_ID }}
ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.SIGNING_PASSWORD }}
ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.SIGNING_KEY }}
ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.SIGNING_KEY }}
16 changes: 8 additions & 8 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
[versions]
agp = "8.4.2"
dokka = "1.9.10"
agp = "8.5.2"
dokka = "1.9.20"
nexusPlugin = "0.29.0"
kotlin = "2.0.0"
kotlinBinaryCompatibility = "0.14.0"
kotlin = "2.0.10"
kotlinBinaryCompatibility = "0.16.3"
compose-plugin = "1.6.11"
jvmTarget = "11"
androidxActivity = "1.9.0"
androidxTest = "1.5.2"
androidxActivity = "1.9.1"
androidxTest = "1.6.2"
androidxNavigation = "2.7.0-alpha07"
imagePicker = "0.5.2"
baselineProfiles = "1.3.1"
macroBenchmark = "1.2.4"
uiAutomator = "2.3.0"
spotless = "6.21.0"
junit = "1.1.5"
espresso-core = "3.5.1"
junit = "1.2.1"
espresso-core = "3.6.1"
androidxMacroBenchmark = "1.2.4"

[plugins]
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-all.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
zipStorePath=wrapper/dists
7 changes: 5 additions & 2 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
# SPDX-License-Identifier: Apache-2.0
#

##############################################################################
#
Expand Down Expand Up @@ -55,7 +57,7 @@
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project.
#
# You can find Gradle at https://github.com/gradle/gradle/.
Expand Down Expand Up @@ -84,7 +86,8 @@ done
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
' "$PWD" ) || exit

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
Expand Down
2 changes: 2 additions & 0 deletions gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem
@rem SPDX-License-Identifier: Apache-2.0
@rem

@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
Expand Down

0 comments on commit c9544e8

Please sign in to comment.