Skip to content

Commit 60713bf

Browse files
committed
Update dependencies and fix issues that arise
1 parent 80833ed commit 60713bf

14 files changed

+70
-57
lines changed

app/build.gradle

Lines changed: 24 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,12 @@ def addConfigValues = { name, isDebug, suffix = "" ->
3030
android.defaultConfig.resValue "string", name.toLowerCase(), value
3131
}
3232

33+
sqldelight {
34+
Database {
35+
packageName = "com.github.pockethub.android"
36+
}
37+
}
38+
3339
android {
3440
compileSdkVersion 28
3541

@@ -107,6 +113,10 @@ android {
107113
targetCompatibility JavaVersion.VERSION_1_8
108114
}
109115

116+
kotlinOptions {
117+
jvmTarget = JavaVersion.VERSION_1_8.toString()
118+
}
119+
110120
testOptions {
111121
animationsDisabled = true
112122
unitTests {
@@ -153,14 +163,15 @@ dependencies {
153163

154164
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
155165

156-
implementation 'androidx.appcompat:appcompat:1.0.2'
157-
implementation 'com.google.android.material:material:1.0.0'
166+
implementation 'androidx.appcompat:appcompat:1.1.0'
167+
implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.0.0'
168+
implementation 'com.google.android.material:material:1.1.0'
158169

159-
implementation 'androidx.core:core-ktx:1.0.1'
170+
implementation 'androidx.core:core-ktx:1.2.0'
160171

161172
implementation 'com.jakewharton.picasso:picasso2-okhttp3-downloader:1.1.0'
162173
implementation 'com.squareup.okhttp3:okhttp:3.10.0'
163-
implementation "com.squareup.sqldelight:android-driver:1.0.3"
174+
implementation "com.squareup.sqldelight:android-driver:1.2.2"
164175

165176
implementation 'io.reactivex.rxjava2:rxandroid:2.0.2'
166177
implementation 'io.reactivex.rxjava2:rxjava:2.1.10'
@@ -169,17 +180,17 @@ dependencies {
169180

170181
implementation 'com.bugsnag:bugsnag-android:4.3.1'
171182

172-
implementation 'com.google.dagger:dagger:2.16'
173-
implementation 'com.google.dagger:dagger-android:2.16'
174-
implementation 'com.google.dagger:dagger-android-support:2.16'
183+
implementation 'com.google.dagger:dagger:2.27'
184+
implementation 'com.google.dagger:dagger-android:2.27'
185+
implementation 'com.google.dagger:dagger-android-support:2.27'
175186

176-
kapt 'com.google.dagger:dagger-compiler:2.16'
177-
kapt 'com.google.dagger:dagger-android-processor:2.16'
187+
kapt 'com.google.dagger:dagger-compiler:2.27'
188+
kapt 'com.google.dagger:dagger-android-processor:2.27'
178189

179190
compileOnly 'com.episode6.hackit.auto.factory:auto-factory-annotations:1.0-beta5'
180-
kapt 'com.google.auto.factory:auto-factory:1.0-beta5'
191+
kapt 'com.google.auto.factory:auto-factory:1.0-beta7'
181192

182-
implementation 'com.github.meisolsson:githubsdk:0.6.1'
193+
implementation 'com.github.meisolsson:githubsdk:0.6.3'
183194
implementation 'com.afollestad.material-dialogs:core:0.9.6.0'
184195
implementation 'com.xwray:groupie:2.3.0'
185196
implementation 'com.xwray:groupie-kotlin-android-extensions:2.3.0'
@@ -192,7 +203,7 @@ dependencies {
192203
//Libs for testing
193204
testImplementation 'junit:junit:4.12'
194205
testImplementation "org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version"
195-
testImplementation "androidx.test:core:1.1.0"
206+
testImplementation "androidx.test:core:1.2.0"
196207
testImplementation "org.mockito:mockito-core:2.18.3"
197-
testImplementation "org.robolectric:robolectric:4.2"
208+
testImplementation "org.robolectric:robolectric:4.2.1"
198209
}

app/src/main/java/com/github/pockethub/android/ApplicationModule.java

Lines changed: 0 additions & 25 deletions
This file was deleted.
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
package com.github.pockethub.android
2+
3+
import android.app.Application
4+
import android.content.Context
5+
import com.github.pockethub.android.Database.Companion.Schema
6+
import com.squareup.sqldelight.android.AndroidSqliteDriver
7+
import dagger.Binds
8+
import dagger.Module
9+
import dagger.Provides
10+
import javax.inject.Singleton
11+
12+
@Module
13+
internal abstract class ApplicationModule {
14+
@Binds
15+
@Singleton
16+
abstract fun provideApplicationContext(application: Application?): Context?
17+
18+
companion object {
19+
@JvmStatic
20+
@Singleton
21+
@Provides
22+
fun provideDatabase(context: Context?): Database {
23+
val driver = AndroidSqliteDriver(Schema, context!!, "cache.db")
24+
return Database(driver)
25+
}
26+
}
27+
}

app/src/main/java/com/github/pockethub/android/ui/commit/CommitCompareListFragment.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ class CommitCompareListFragment : BaseFragment(), OnItemClickListener {
8484

8585
private var compare: CommitCompare? = null
8686

87-
override fun onAttach(context: Context?) {
87+
override fun onAttach(context: Context) {
8888
super.onAttach(context)
8989

9090
val activity = context as Activity

app/src/main/java/com/github/pockethub/android/ui/commit/CommitListFragment.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ class CommitListFragment : BaseFragment(), DialogResultListener {
8888
protected val errorMessage: Int
8989
get() = R.string.error_commits_load
9090

91-
override fun onAttach(context: Context?) {
91+
override fun onAttach(context: Context) {
9292
super.onAttach(context)
9393

9494
val activity = context as Activity?

app/src/main/java/com/github/pockethub/android/ui/gist/GistFileFragment.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ class GistFileFragment : BaseFragment(), OnSharedPreferenceChangeListener {
6060

6161
private var wrapItem: MenuItem? = null
6262

63-
override fun onAttach(context: Context?) {
63+
override fun onAttach(context: Context) {
6464
super.onAttach(context)
6565

6666
gistId = activity?.intent?.getStringExtra(EXTRA_GIST_ID)

app/src/main/java/com/github/pockethub/android/ui/helpers/ListFetcher.kt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ import io.reactivex.disposables.Disposables
1515
import io.reactivex.schedulers.Schedulers
1616

1717
class ListFetcher<E>(
18-
private val swipeRefreshLayout: SwipeRefreshLayout?,
19-
private val lifecycle: Lifecycle,
20-
private val itemListHandler: ItemListHandler,
21-
private val showError: (Throwable) -> Unit,
22-
private val loadData: (force: Boolean) -> Single<List<E>>,
23-
private val createItem: (item: E) -> Item<*>
18+
private val swipeRefreshLayout: SwipeRefreshLayout?,
19+
private val lifecycle: Lifecycle,
20+
private val itemListHandler: ItemListHandler,
21+
private val showError: (Throwable) -> Unit,
22+
private val loadData: (force: Boolean) -> Single<List<E>>,
23+
private val createItem: (item: E) -> Item<*>
2424
): LifecycleObserver {
2525

2626
/**

app/src/main/java/com/github/pockethub/android/ui/issue/EditIssueActivity.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@ class EditIssueActivity : BaseActivity(), DialogResultListener {
328328
}
329329
}
330330

331-
override fun onSaveInstanceState(outState: Bundle?) {
331+
override fun onSaveInstanceState(outState: Bundle) {
332332
super.onSaveInstanceState(outState)
333333

334334
outState!!.putParcelable(EXTRA_ISSUE, issue)

app/src/main/java/com/github/pockethub/android/ui/issue/IssuesFragment.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ class IssuesFragment : BaseFragment() {
8282

8383
val errorMessage= R.string.error_issues_load
8484

85-
override fun onAttach(context: Context?) {
85+
override fun onAttach(context: Context) {
8686
super.onAttach(context)
8787

8888
val intent = activity?.intent

app/src/main/java/com/github/pockethub/android/ui/repo/RepositoryContributorsFragment.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ class RepositoryContributorsFragment : BaseFragment() {
6969
protected val errorMessage: Int
7070
get() = R.string.error_contributors_load
7171

72-
override fun onAttach(context: Context?) {
72+
override fun onAttach(context: Context) {
7373
super.onAttach(context)
7474

7575
repo = activity?.intent?.getParcelableExtra(EXTRA_REPOSITORY)

0 commit comments

Comments
 (0)