nomad/ananas
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update to gradle 7.0.0 and build tools 31.0.0

Browse source
This commit is contained in:
jarnedemeulemeester 2021-07-29 14:11:46 +02:00
parent fe7775329a
commit 588de655d5
No known key found for this signature in database
GPG key ID: 60884A0C1EBA43E5
7 changed files with 15 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -8,6 +8,7 @@
/.idea/navEditor.xml
/.idea/assetWizardSettings.xml
/.idea/discord.xml
/.idea/gradle.xml
.DS_Store
/build
/captures

20
.idea/gradle.xml
View file

@ -1,20 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="GradleMigrationSettings" migrationVersion="1" />
<component name="GradleSettings">
<option name="linkedExternalProjectsSettings">
<GradleProjectSettings>
<option name="testRunner" value="PLATFORM" />
<option name="distributionType" value="DEFAULT_WRAPPED" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="modules">
<set>
<option value="$PROJECT_DIR$" />
<option value="$PROJECT_DIR$/app" />
</set>
</option>
<option name="resolveModulePerSourceSet" value="false" />
</GradleProjectSettings>
</option>
</component>
</project>

9
.idea/misc.xml
View file

@ -1,5 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="DesignSurface">
<option name="filePathToZoomLevelMap">
<map>
<entry key="app/src/main/res/layout/fragment_home.xml" value="0.1736111111111111" />
<entry key="app/src/main/res/layout/fragment_library.xml" value="0.1736111111111111" />
<entry key="app/src/main/res/layout/fragment_season.xml" value="0.20471014492753623" />
</map>
</option>
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>

10
.idea/runConfigurations.xml
View file

@ -1,10 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="RunConfigurationProducerService">
<option name="ignoredProducers">
<set>
<option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
</set>
</option>
</component>
</project>

7
app/build.gradle
View file

@ -9,8 +9,7 @@ plugins {
android {
compileSdkVersion 31
// Upgrade buildToolsVersion to 31.0.0 when Android Studio Arctic Fox is available
buildToolsVersion "30.0.3"
buildToolsVersion "31.0.0"
defaultConfig {
applicationId "dev.jdtech.jellyfin"
@ -53,7 +52,7 @@ android {
dependencies {
implementation 'androidx.core:core-ktx:1.6.0'
implementation 'androidx.core:core-splashscreen:1.0.0-alpha01'
implementation 'androidx.appcompat:appcompat:1.3.0'
implementation 'androidx.appcompat:appcompat:1.3.1'
// Material
implementation 'com.google.android.material:material:1.4.0'
@ -95,7 +94,7 @@ dependencies {
kapt "com.google.dagger:hilt-compiler:$hilt_version"
// ExoPlayer
def exoplayer_version = "2.14.1"
def exoplayer_version = "2.14.2"
implementation "com.google.android.exoplayer:exoplayer-core:$exoplayer_version"
implementation "com.google.android.exoplayer:exoplayer-ui:$exoplayer_version"
implementation files('libs/extension-ffmpeg-release.aar')

2
build.gradle
View file

@ -6,7 +6,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath "com.android.tools.build:gradle:4.2.2"
classpath 'com.android.tools.build:gradle:7.0.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
// NOTE: Do not place your application dependencies here; they belong

2
gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -1,6 +1,6 @@
#Sat May 29 10:38:39 CEST 2021
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME