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.

Sign up for GitHub

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

Upgrade gradle version #721

Draft
wants to merge 3 commits into
base: dev
Choose a base branch
from
Draft

Upgrade gradle version #721

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7df99f1
Upgrade gradle version
AniketSK May 29, 2024
189c0aa
Update java version
AniketSK May 30, 2024
cdb52b0
Add missing logo
AniketSK May 30, 2024
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
13 changes: 6 additions & 7 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ plugins {
}
android {
compileSdk 34

namespace = "live.hms.app2"
defaultConfig {
applicationId "live.hms.app2"
minSdkVersion 21
Expand Down Expand Up @@ -40,15 +40,14 @@ android {
}

buildFeatures {
viewBinding = true
viewBinding true
buildConfig true
}
compileOptions {
sourceCompatibility = "1.8"
targetCompatibility = "1.8"
}
kotlinOptions {
jvmTarget = '1.8'
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
}

}

dependencies {
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ buildscript {
}
}
dependencies {
classpath 'com.android.tools.build:gradle:7.4.2'
classpath 'com.android.tools.build:gradle:8.4.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"

// Jetpack Navigation
Expand Down
6 changes: 3 additions & 3 deletions gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Thu Feb 10 17:14:29 IST 2022
#Wed May 29 15:31:08 IST 2024
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
13 changes: 3 additions & 10 deletions room-kit/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@ android {
defaultConfig {
minSdkVersion 21
targetSdk 34
versionCode 1
versionName getVersionName()

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles "consumer-rules.pro"
Expand All @@ -39,19 +37,14 @@ android {
}
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
kotlinOptions {
jvmTarget = '1.8'
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
}

buildFeatures {
viewBinding true
dataBinding {
enabled true
}
compose true
buildConfig true
}
composeOptions {
kotlinCompilerExtensionVersion = "1.4.8"
Expand Down
24 changes: 24 additions & 0 deletions room-kit/src/main/res/drawable/exo_edit_mode_logo.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="33dp"
android:height="32dp"
android:viewportWidth="33"
android:viewportHeight="32">
<path
android:pathData="M14.939,0h3.122v32h-3.122z"
android:fillColor="#538DFF"/>
<path
android:pathData="M23.148,1.363l2.704,1.561l-16,27.713l-2.704,-1.561z"
android:fillColor="#538DFF"/>
<path
android:pathData="M32.5,14.439l-0,3.122l-32,0l-0,-3.122z"
android:fillColor="#538DFF"/>
<path
android:pathData="M31.137,22.648l-1.561,2.704l-27.713,-16l1.561,-2.704z"
android:fillColor="#538DFF"/>
<path
android:pathData="M25.852,29.076l-2.704,1.561l-16,-27.713l2.704,-1.561z"
android:fillColor="#538DFF"/>
<path
android:pathData="M29.576,6.648l1.561,2.704l-27.713,16l-1.561,-2.704z"
android:fillColor="#538DFF"/>
</vector>