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 AGP, Gradle, and bump dependencies #23

Merged
merged 2 commits into from
Aug 31, 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
51 changes: 23 additions & 28 deletions .github/workflows/android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,52 +9,47 @@ on:
jobs:
lint:
name: Spotless check
runs-on: ubuntu-18.04
runs-on: ubuntu-latest
steps:
- name: Check out code
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Set up JDK
uses: actions/setup-java@v1
uses: actions/setup-java@v3
with:
java-version: 11
distribution: zulu
java-version: 17
- uses: gradle/gradle-build-action@v2.8.0
- name: spotless
run: ./gradlew spotlessCheck

api_check:
name: API check
runs-on: ubuntu-18.04
runs-on: ubuntu-latest
steps:
- name: Check out code
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Set up JDK
uses: actions/setup-java@v1
uses: actions/setup-java@v3
with:
java-version: 11
distribution: zulu
java-version: 17
- uses: gradle/gradle-build-action@v2.8.0
- name: API check
run: ./gradlew apiCheck

build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2

- name: set up JDK
uses: actions/setup-java@v1
with:
java-version: 11

- name: Cache Gradle and wrapper
uses: actions/cache@v2
with:
path: |
~/.gradle/caches
~/.gradle/wrapper
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}
restore-keys: |
${{ runner.os }}-gradle-
- uses: actions/checkout@v3
- name: set up JDK
uses: actions/setup-java@v3
with:
distribution: zulu
java-version: 17

- name: Make Gradle executable
run: chmod +x ./gradlew
- uses: gradle/gradle-build-action@v2.8.0
- name: Make Gradle executable
run: chmod +x ./gradlew

- name: Build with Gradle
run: ./gradlew build
- name: Build with Gradle
run: ./gradlew build
6 changes: 3 additions & 3 deletions .github/workflows/publish-snapshot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ jobs:
steps:
- name: Check out code
uses: actions/checkout@v2
- name: Set up JDK 11
- name: Set up JDK 17
uses: actions/setup-java@v2
with:
distribution: adopt
java-version: 11
distribution: zulu
java-version: 17
- name: Release build
run: ./gradlew assemble --scan
- name: Source jar and dokka
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ jobs:
steps:
- name: Check out code
uses: actions/checkout@v2
- name: Set up JDK 11
- name: Set up JDK 17
uses: actions/setup-java@v2
with:
distribution: adopt
java-version: 11
distribution: zulu
java-version: 17
- name: Release build
run: ./gradlew assemble --scan
- name: Source jar and dokka
Expand Down
8 changes: 5 additions & 3 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ plugins {

android {
compileSdkVersion Configuration.compileSdk
namespace "com.skydoves.retrofitadaptersdemo"

defaultConfig {
applicationId "com.skydoves.retrofitadaptersdemo"
minSdkVersion Configuration.minSdkDemo
Expand All @@ -23,12 +25,12 @@ android {
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
}

kotlinOptions {
jvmTarget = "11"
jvmTarget = "17"
}

lintOptions {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
package com.skydoves.retrofit.adapters

object Configuration {
const val compileSdk = 32
const val targetSdk = 32
const val compileSdk = 34
const val targetSdk = 34
const val minSdk = 19
const val minSdkDemo = 21
const val majorVersion = 1
Expand Down
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
package com.skydoves.retrofit.adapters

object Versions {
internal const val ANDROID_GRADLE_PLUGIN = "7.4.0"
internal const val ANDROID_GRADLE_PLUGIN = "8.1.0"
internal const val ANDROID_GRADLE_SPOTLESS = "6.7.0"
internal const val GRADLE_NEXUS_PUBLISH_PLUGIN = "1.3.0"
internal const val KOTLIN = "1.8.10"
internal const val KOTLIN_SERIALIZATION_JSON = "1.4.0"
internal const val KOTLIN_GRADLE_DOKKA = "1.7.20"
internal const val KOTLIN_BINARY_VALIDATOR = "0.13.0"
internal const val KOTLIN = "1.9.10"
internal const val KOTLIN_SERIALIZATION_JSON = "1.6.0"
internal const val KOTLIN_GRADLE_DOKKA = "1.8.20"
internal const val KOTLIN_BINARY_VALIDATOR = "0.13.2"

internal const val RETROFIT = "2.9.0"
internal const val OKHTTP = "4.10.0"
internal const val COROUTINES = "1.6.4"
internal const val MOSHI = "1.14.0"
internal const val ARROW = "1.1.5"
internal const val OKHTTP = "4.11.0"
internal const val COROUTINES = "1.7.3"
internal const val MOSHI = "1.15.0"
internal const val ARROW = "1.2.0"
internal const val PAGING = "3.1.1"

internal const val APPCOMPAT = "1.4.1"
internal const val MATERIAL = "1.5.0"
internal const val GLIDE = "4.13.1"
internal const val LIFECYCLE = "2.4.1"
internal const val APPCOMPAT = "1.6.1"
internal const val MATERIAL = "1.9.0"
internal const val GLIDE = "4.16.0"
internal const val LIFECYCLE = "2.6.1"
internal const val TIMBER = "5.0.1"

internal const val JUNIT = "4.13.1"
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
4 changes: 2 additions & 2 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -144,15 +144,15 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
case $MAX_FD in #(
max*)
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC3045
# shellcheck disable=SC3045
MAX_FD=$( ulimit -H -n ) ||
warn "Could not query maximum file descriptor limit"
esac
case $MAX_FD in #(
'' | soft) :;; #(
*)
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC3045
# shellcheck disable=SC3045
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
Expand Down
8 changes: 5 additions & 3 deletions retrofit-adapters-paging/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ apply from: "${rootDir}/scripts/publish-module.gradle"

android {
compileSdkVersion Configuration.compileSdk
namespace "com.skydoves.retrofit.adapters.paging"

defaultConfig {
minSdkVersion Configuration.minSdk
targetSdkVersion Configuration.targetSdk
Expand All @@ -26,12 +28,12 @@ android {
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_11
targetCompatibility JavaVersion.VERSION_11
}

kotlinOptions {
jvmTarget = "1.8"
jvmTarget = "11"
}

lintOptions {
Expand Down