Skip to content

Commit fd7602e

Browse files
Merge pull request #18 from parmeshtoyou/library_version_updates
libs version update to support latest android studio
2 parents 8d98c29 + 2d36b1d commit fd7602e

File tree

8 files changed

+63
-41
lines changed

8 files changed

+63
-41
lines changed

.github/workflows/build_and_test.yml

+5-4
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,14 @@ jobs:
1010
steps:
1111
- uses: actions/checkout@v1
1212

13-
- name: Set Up JDK
14-
uses: actions/setup-java@v1
13+
- name: Set up JDK 17
14+
uses: actions/setup-java@v3
1515
with:
16-
java-version: 1.11
16+
distribution: 'temurin'
17+
java-version: '17'
1718

1819
- name: Run Tests
1920
run: ./gradlew test
2021

2122
- name: Build Project
22-
run: ./gradlew assemble
23+
run: ./gradlew assemble

.idea/compiler.xml

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/build.gradle

+17-18
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,13 @@ apply plugin: 'kotlin-kapt'
44
apply plugin: 'kotlin-parcelize'
55

66
android {
7-
compileSdkVersion 32
87

8+
compileSdkVersion 34
99
defaultConfig {
1010
applicationId "com.lukaslechner.coroutineusecasesonandroid"
11-
minSdkVersion 21
12-
targetSdkVersion 32
1311
versionCode 1
1412
versionName "1.0"
15-
13+
minSdk 26
1614
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1715
}
1816

@@ -49,51 +47,52 @@ android {
4947
checkReleaseBuilds false
5048
}
5149
}
50+
namespace 'com.lukaslechner.coroutineusecasesonandroid'
5251
}
5352

5453
dependencies {
5554

56-
def lifecycle_version = "2.4.1"
57-
def coroutines_version = "1.6.3"
55+
def lifecycle_version = "2.8.6"
56+
def coroutines_version = "1.8.1"
5857

5958
implementation fileTree(dir: 'libs', include: ['*.jar'])
6059
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
6160

6261
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version"
6362
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version"
6463

65-
implementation 'androidx.appcompat:appcompat:1.4.2'
66-
implementation 'com.google.android.material:material:1.6.1'
64+
implementation 'androidx.appcompat:appcompat:1.7.0'
65+
implementation 'com.google.android.material:material:1.12.0'
6766

68-
implementation 'androidx.core:core-ktx:1.8.0'
69-
implementation "androidx.activity:activity-ktx:1.4.0"
67+
implementation 'androidx.core:core-ktx:1.13.1'
68+
implementation "androidx.activity:activity-ktx:1.9.2"
7069

71-
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
72-
implementation 'androidx.recyclerview:recyclerview:1.2.1'
70+
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
71+
implementation 'androidx.recyclerview:recyclerview:1.3.2'
7372
implementation 'androidx.cardview:cardview:1.0.0'
7473

7574
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
7675
implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version"
7776
implementation "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle_version"
7877

79-
implementation 'com.squareup.retrofit2:retrofit:2.9.0'
78+
implementation 'com.squareup.retrofit2:retrofit:2.11.0'
8079
implementation 'com.squareup.retrofit2:adapter-rxjava2:2.7.1'
81-
implementation 'com.google.code.gson:gson:2.8.9'
82-
implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
80+
implementation 'com.google.code.gson:gson:2.10.1'
81+
implementation 'com.squareup.retrofit2:converter-gson:2.11.0'
8382

8483
implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
8584
implementation 'io.reactivex.rxjava2:rxjava:2.2.19'
8685
implementation 'io.reactivex.rxjava2:rxkotlin:2.4.0'
8786

8887
implementation "androidx.lifecycle:lifecycle-common-java8:$lifecycle_version"
8988

90-
def work_manager_version = "2.7.1"
89+
def work_manager_version = "2.9.1"
9190
implementation "androidx.work:work-runtime:$work_manager_version"
9291
implementation "androidx.work:work-runtime-ktx:$work_manager_version"
9392

9493
implementation 'com.jakewharton.timber:timber:5.0.1'
9594

96-
def room_version = "2.4.2"
95+
def room_version = "2.6.1"
9796
implementation "androidx.room:room-runtime:$room_version"
9897
implementation "androidx.room:room-ktx:$room_version"
9998
kapt "androidx.room:room-compiler:$room_version"
@@ -104,7 +103,7 @@ dependencies {
104103
testImplementation project(path: ':app')
105104

106105
testImplementation 'junit:junit:4.13.2'
107-
testImplementation 'androidx.arch.core:core-testing:2.1.0'
106+
testImplementation 'androidx.arch.core:core-testing:2.2.0'
108107
testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutines_version"
109108
testImplementation 'com.squareup.retrofit2:retrofit-mock:2.7.1'
110109

app/src/main/AndroidManifest.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="com.lukaslechner.coroutineusecasesonandroid">
2+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
43

54
<application
65
android:name=".CoroutineUsecasesOnAndroidApplication"

build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22

33
buildscript {
4-
ext.kotlin_version = '1.6.21'
4+
ext.kotlin_version = '1.9.21'
55
repositories {
66
google()
77
mavenCentral()
88
}
99
dependencies {
10-
classpath 'com.android.tools.build:gradle:7.4.2'
10+
classpath 'com.android.tools.build:gradle:8.6.1'
1111
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1212

1313
// NOTE: Do not place your application dependencies here; they belong

gradle.properties

+3
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,6 @@ android.useAndroidX=true
1919
android.enableJetifier=true
2020
# Kotlin code style for this project: "official" or "obsolete":
2121
kotlin.code.style=official
22+
android.defaults.buildfeatures.buildconfig=true
23+
android.nonTransitiveRClass=false
24+
android.nonFinalResIds=false
+3-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
4+
networkTimeout=10000
5+
validateDistributionUrl=true
46
zipStoreBase=GRADLE_USER_HOME
57
zipStorePath=wrapper/dists

gradlew

+31-13
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
# See the License for the specific language governing permissions and
1616
# limitations under the License.
1717
#
18+
# SPDX-License-Identifier: Apache-2.0
19+
#
1820

1921
##############################################################################
2022
#
@@ -55,7 +57,7 @@
5557
# Darwin, MinGW, and NonStop.
5658
#
5759
# (3) This script is generated from the Groovy template
58-
# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
60+
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
5961
# within the Gradle project.
6062
#
6163
# You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,13 +82,12 @@ do
8082
esac
8183
done
8284

83-
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
84-
85-
APP_NAME="Gradle"
85+
# This is normally unused
86+
# shellcheck disable=SC2034
8687
APP_BASE_NAME=${0##*/}
87-
88-
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
89-
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
88+
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
89+
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
90+
' "$PWD" ) || exit
9091

9192
# Use the maximum available, or set MAX_FD != -1 to use that value.
9293
MAX_FD=maximum
@@ -133,22 +134,29 @@ location of your Java installation."
133134
fi
134135
else
135136
JAVACMD=java
136-
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
137+
if ! command -v java >/dev/null 2>&1
138+
then
139+
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
137140
138141
Please set the JAVA_HOME variable in your environment to match the
139142
location of your Java installation."
143+
fi
140144
fi
141145

142146
# Increase the maximum file descriptors if we can.
143147
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
144148
case $MAX_FD in #(
145149
max*)
150+
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
151+
# shellcheck disable=SC2039,SC3045
146152
MAX_FD=$( ulimit -H -n ) ||
147153
warn "Could not query maximum file descriptor limit"
148154
esac
149155
case $MAX_FD in #(
150156
'' | soft) :;; #(
151157
*)
158+
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
159+
# shellcheck disable=SC2039,SC3045
152160
ulimit -n "$MAX_FD" ||
153161
warn "Could not set maximum file descriptor limit to $MAX_FD"
154162
esac
@@ -193,18 +201,28 @@ if "$cygwin" || "$msys" ; then
193201
done
194202
fi
195203

196-
# Collect all arguments for the java command;
197-
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
198-
# shell script including quotes and variable substitutions, so put them in
199-
# double quotes to make sure that they get re-expanded; and
200-
# * put everything else in single quotes, so that it's not re-expanded.
204+
205+
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
206+
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
207+
208+
# Collect all arguments for the java command:
209+
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
210+
# and any embedded shellness will be escaped.
211+
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
212+
# treated as '${Hostname}' itself on the command line.
201213

202214
set -- \
203215
"-Dorg.gradle.appname=$APP_BASE_NAME" \
204216
-classpath "$CLASSPATH" \
205217
org.gradle.wrapper.GradleWrapperMain \
206218
"$@"
207219

220+
# Stop when "xargs" is not available.
221+
if ! command -v xargs >/dev/null 2>&1
222+
then
223+
die "xargs is not available"
224+
fi
225+
208226
# Use "xargs" to parse quoted args.
209227
#
210228
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.

0 commit comments

Comments
 (0)