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

Jump to bottom

Feature/update deps #7

Closed
wants to merge 3 commits into from
Closed

Feature/update deps #7

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
26207af
gradle files changes
Mar 26, 2020
6707308
update all libs
Mar 26, 2020
d858e9a
Update UserService.kt
hamedsilver Mar 26, 2020
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
134 changes: 109 additions & 25 deletions .idea/codeStyles/Project.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions .idea/gradle.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/misc.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion android_core_dependencies.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ dependencies {
implementation AndroidLibraries.coreKtx
implementation AndroidLibraries.constraintLayout
implementation AndroidLibraries.lifecycleViewModel
implementation AndroidLibraries.lifecycleExtensions
implementation AndroidLibraries.recyclerView
implementation AndroidLibraries.navigation
implementation AndroidLibraries.navigationFrag
Expand Down
2 changes: 2 additions & 0 deletions android_feature_dependencies.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
apply plugin: 'com.android.library'
apply from: '../../android_core_dependencies.gradle'
apply from: '../../android_commons.gradle'
apply plugin: 'kotlin-kapt'
apply plugin: "androidx.navigation.safeargs.kotlin"

dependencies {
implementation project(Modules.common)
Expand Down
9 changes: 9 additions & 0 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,15 @@ android {
dataBinding {
enabled true
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}

kotlinOptions {
jvmTarget = JavaVersion.VERSION_1_8.toString()
}
}

dependencies {
Expand Down
13 changes: 8 additions & 5 deletions app/src/main/java/io/philippeboisney/archapp/App.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,21 @@ package io.philippeboisney.archapp

import android.app.Application
import io.philippeboisney.archapp.di.appComponent
import org.koin.android.ext.android.startKoin
import org.koin.android.ext.koin.androidContext
import org.koin.core.context.startKoin

open class App: Application() {
open class App : Application() {
override fun onCreate() {
super.onCreate()
configureDi()
}

// CONFIGURATION ---
open fun configureDi() =
startKoin(this, provideComponent())
open fun configureDi() = startKoin {
androidContext(this@App)
modules(provideComponent())
}

// PUBLIC API ---
open fun provideComponent() = appComponent
}
}
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 @@ -7,7 +7,7 @@ buildscript {
dependencies {
classpath "com.android.tools.build:gradle:${Versions.gradle}"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.kotlin}"
classpath "androidx.navigation:navigation-safe-args-gradle-plugin:${Versions.safeArgs}"
classpath "androidx.navigation:navigation-safe-args-gradle-plugin:${Versions.nav}"
}
}

Expand Down
Loading