tenkuma/jamfish
tenkuma/jamfish
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

conditionally use local api client

Browse source
This commit is contained in:
dkanada 2020-05-01 15:27:55 +09:00
commit 692ea5efee
3 changed files with 18 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

11
app/build.gradle
View file

@ -18,6 +18,7 @@ android {
minifyEnabled true minifyEnabled true
shrinkResources true shrinkResources true
} }
debug { debug {
applicationIdSuffix '.debug' applicationIdSuffix '.debug'
} }
@ -46,7 +47,6 @@ dependencies {
implementation 'androidx.gridlayout:gridlayout:1.0.0' implementation 'androidx.gridlayout:gridlayout:1.0.0'
implementation 'androidx.cardview:cardview:1.0.0' implementation 'androidx.cardview:cardview:1.0.0'
implementation 'androidx.palette:palette:1.0.0' implementation 'androidx.palette:palette:1.0.0'
implementation 'com.google.android.material:material:1.0.0'
implementation 'androidx.annotation:annotation:1.1.0' implementation 'androidx.annotation:annotation:1.1.0'
implementation 'androidx.percentlayout:percentlayout:1.0.0' implementation 'androidx.percentlayout:percentlayout:1.0.0'
implementation 'androidx.preference:preference:1.0.0' implementation 'androidx.preference:preference:1.0.0'
@ -63,9 +63,7 @@ dependencies {
implementation 'com.github.ksoichiro:android-observablescrollview:1.6.0' implementation 'com.github.ksoichiro:android-observablescrollview:1.6.0'
implementation 'com.heinrichreimersoftware:material-intro:1.6' implementation 'com.heinrichreimersoftware:material-intro:1.6'
implementation 'me.zhanghai.android.materialprogressbar:library:1.4.2' implementation 'me.zhanghai.android.materialprogressbar:library:1.4.2'
implementation('com.h6ah4i.android.widget.advrecyclerview:advrecyclerview:0.11.0@aar') { implementation('com.h6ah4i.android.widget.advrecyclerview:advrecyclerview:0.11.0')
transitive = true
}
implementation 'com.jakewharton:butterknife:10.1.0' implementation 'com.jakewharton:butterknife:10.1.0'
annotationProcessor 'com.jakewharton:butterknife-compiler:10.1.0' annotationProcessor 'com.jakewharton:butterknife-compiler:10.1.0'
@ -73,6 +71,7 @@ dependencies {
implementation 'com.squareup.retrofit2:retrofit:2.5.0' implementation 'com.squareup.retrofit2:retrofit:2.5.0'
implementation 'com.squareup.retrofit2:converter-gson:2.5.0' implementation 'com.squareup.retrofit2:converter-gson:2.5.0'
implementation 'com.google.code.gson:gson:2.8.5' implementation 'com.google.code.gson:gson:2.8.5'
implementation 'com.google.android.material:material:1.0.0'
implementation 'com.anjlab.android.iab.v3:library:1.0.44' implementation 'com.anjlab.android.iab.v3:library:1.0.44'
implementation 'de.psdev.licensesdialog:licensesdialog:2.0.0' implementation 'de.psdev.licensesdialog:licensesdialog:2.0.0'
@ -83,7 +82,5 @@ dependencies {
implementation 'com.github.AdrienPoupa:jaudiotagger:2.2.3' implementation 'com.github.AdrienPoupa:jaudiotagger:2.2.3'
implementation 'com.github.jellyfin:jellyfin-apiclient-java:-SNAPSHOT' implementation 'com.github.jellyfin.jellyfin-apiclient-java:android:0.6.0'
//implementation project(':apiclient')
//implementation project(':library')
} }

7
build.gradle
View file

@ -3,8 +3,9 @@ buildscript {
google() google()
jcenter() jcenter()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:3.4.1' classpath 'com.android.tools.build:gradle:3.5.3'
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1' classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
} }
} }
@ -13,6 +14,8 @@ allprojects {
repositories { repositories {
google() google()
jcenter() jcenter()
maven { url "https://jitpack.io" } maven {
url "https://jitpack.io"
}
} }
} }

13
settings.gradle
View file

@ -1,7 +1,12 @@
include ':app' include ':app'
// include ':apiclient' def enableDependencySubstitution = properties.get('enable.dependency.substitution', 'true').equalsIgnoreCase('true')
// project(':apiclient').projectDir = new File(settingsDir, '../jellyfin-apiclient-java/android') def apiClientLocation = '../jellyfin-apiclient-java'
// include ':library' if (new File(apiClientLocation).exists() && enableDependencySubstitution) {
// project(':library').projectDir = new File(settingsDir, '../jellyfin-apiclient-java/library') includeBuild(apiClientLocation) {
dependencySubstitution {
substitute module('com.github.jellyfin.jellyfin-apiclient-java:android') with project(':android')
}
}
}