Skip to content

Commit f2234c3

Browse files
authored
Merge pull request #31 from patjackson52/update-redux
update redux and refactor to org.reduxkotlin package
2 parents 812c4f0 + a2c05e3 commit f2234c3

File tree

185 files changed

+827
-1485
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

185 files changed

+827
-1485
lines changed

android/build.gradle

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ android {
1515
}
1616
compileSdkVersion 28
1717
defaultConfig {
18-
applicationId "com.willowtreeapps.namegame"
18+
applicationId "org.reduxkotlin.namegame"
1919
minSdkVersion 26
2020
targetSdkVersion 28
2121
versionCode 1
@@ -50,14 +50,15 @@ android {
5050
dependencies {
5151
implementation fileTree(dir: 'libs', include: ['*.jar'])
5252
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
53-
implementation 'androidx.appcompat:appcompat:1.0.2'
54-
implementation 'com.google.android.material:material:1.1.0-alpha08'
53+
implementation 'androidx.appcompat:appcompat:1.1.0-rc01'
54+
implementation 'com.google.android.material:material:1.1.0-alpha09'
5555
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
5656
implementation "android.arch.navigation:navigation-fragment-ktx:$ktxVersion"
5757
implementation "android.arch.navigation:navigation-ui-ktx:$ktxVersion"
58+
implementation "org.reduxkotlin:redux-kotlin:$reduxVersion"
59+
implementation "org.reduxkotlin:presenter-middleware:$reduxPresenterMiddlewareVersion"
60+
implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion"
5861

59-
implementation "com.facebook.stetho:stetho:$stethoVersion"
60-
implementation "com.facebook.stetho:stetho-okhttp3:$stethoVersion"
6162
implementation "com.github.bumptech.glide:glide:$glideVersion"
6263
implementation "com.github.bumptech.glide:okhttp3-integration:$glideVersion"
6364

@@ -79,9 +80,6 @@ dependencies {
7980
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
8081

8182
implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta2'
82-
implementation 'com.google.firebase:firebase-core:16.0.8'
83-
implementation 'com.google.firebase:firebase-auth:16.2.1'
84-
implementation 'com.firebaseui:firebase-ui-auth:4.3.2'
8583
debugImplementation 'com.willowtreeapps.hyperion:hyperion-core:0.9.27'
8684
releaseImplementation 'com.willowtreeapps.hyperion:hyperion-core-no-op:0.9.27'
8785
debugImplementation 'com.willowtreeapps.hyperion:hyperion-measurement:0.9.27'
@@ -90,5 +88,3 @@ dependencies {
9088
debugImplementation 'com.willowtreeapps.hyperion:hyperion-build-config:0.9.27'
9189
debugImplementation 'com.willowtreeapps.hyperion:hyperion-attr:0.9.27'
9290
}
93-
94-
apply plugin: 'com.google.gms.google-services'

android/google-services.json

Lines changed: 0 additions & 48 deletions
This file was deleted.
-1.76 KB
Binary file not shown.
-75.1 KB
Binary file not shown.
-1.76 KB
Binary file not shown.
Binary file not shown.
-6.02 KB
Binary file not shown.
-2.1 KB
Binary file not shown.
-8.78 KB
Binary file not shown.
-7.59 KB
Binary file not shown.

0 commit comments

Comments
 (0)