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

Fixes for Recent Google requirements changes #6

Open
wants to merge 13 commits into
base: main
Choose a base branch
from
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,6 @@ Shared utilities and helpers live here.
- Android Automotive emulator
- The computer you're testing the app with should have speakers so you can hear the track playing (obvious, but overlooked sometimes)

Checkout the [Volvo Cars Developer Portal](https://developer.volvocars.com/android-automotive/) for more information on creating apps for cars.
Checkout the [Volvo Cars Developer Portal](https://developer.volvocars.com/in-car-apps/) for more information on creating apps for cars.

Once everything is set up, simply clone this repository, build, and run the app on the target emulator.
11 changes: 6 additions & 5 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ apply plugin: 'kotlin-android'
apply plugin: 'kotlin-kapt'

android {
compileSdkVersion 30
buildToolsVersion "30.0.3"
compileSdkVersion 34
buildToolsVersion "34.0.0"

defaultConfig {
applicationId "com.volvocars.otaevent"
minSdkVersion 29
targetSdkVersion 30
versionCode 5
versionName "0.5"
targetSdkVersion 34
versionCode 6
versionName "0.6"

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
Expand All @@ -32,6 +32,7 @@ android {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
namespace 'com.volvocars.mediasample'
}

dependencies {
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@
limitations under the License.
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="com.volvocars.mediasample">
xmlns:tools="http://schemas.android.com/tools">

<uses-feature
android:name="android.hardware.type.automotive"
Expand Down Expand Up @@ -54,6 +53,7 @@
android:exported="true">
<intent-filter>
<action android:name="android.media.browse.MediaBrowserService"/>
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</service>
</application>
Expand Down
20 changes: 9 additions & 11 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
ext {
kotlin_version = '1.5.30'
kotlin_version = '1.9.20'

// android framework
androidx_core_version = '1.6.0'
androidx_appcompat_version = '1.3.1'
androidx_constraint_layout_version = '2.1.1'
androidx_media_version = '1.4.2'
androidx_core_version = '1.9.0'
androidx_appcompat_version = '1.7.0'
androidx_constraint_layout_version = '2.2.0'
androidx_media_version = '1.7.0'
glide_version = '4.12.0'
exoplayer_version = '2.15.1'

Expand All @@ -16,17 +16,16 @@ buildscript {

// testing framework versions
junit_version = '4.13.2'
androidx_test_version = '1.4.0'
androidx_test_version = '1.6.1'
mockito_version = '1.10.19'
}

repositories {
google()
mavenCentral()
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:7.0.2'
classpath 'com.android.tools.build:gradle:8.7.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"

// NOTE: Do not place your application dependencies here; they belong
Expand All @@ -38,10 +37,9 @@ allprojects {
repositories {
google()
mavenCentral()
jcenter()
}
}

task clean(type: Delete) {
delete rootProject.buildDir
tasks.register('clean', Delete) {
delete project.layout.buildDirectory
}
4 changes: 3 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,6 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
# AndroidX package structure to make it clearer which packages are bundled with the
# Android operating system, and which are packaged with your app"s APK
# https://developer.android.com/topic/libraries/support-library/androidx-rn
android.useAndroidX=true
android.useAndroidX=true
android.nonTransitiveRClass=false
android.nonFinalResIds=false
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 @@
#Mon Aug 30 13:40:09 CEST 2021
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME