Skip to content

Commit 9dfb85a

Browse files
Merge pull request #944 from StepicOrg/release/1.208
Release/1.208
2 parents 81f6f5b + 194af5a commit 9dfb85a

301 files changed

Lines changed: 754 additions & 477 deletions

File tree

Some content is hidden

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

androidsvg/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apply plugin: 'com.android.library'
22

33
android {
4-
compileSdkVersion 30
4+
compileSdkVersion versions.compileSdk
55
buildToolsVersion versions.buildTools
66

77
defaultConfig {

app/build.gradle

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,12 @@ android {
8383
shrinkResources true
8484
proguardFiles getDefaultProguardFile('proguard-android.txt'),
8585
'proguard-rules.pro'
86+
87+
firebaseCrashlytics {
88+
nativeSymbolUploadEnabled true
89+
strippedNativeLibsDir 'build/intermediates/stripped_native_libs/release/out/lib'
90+
unstrippedNativeLibsDir 'build/intermediates/merged_native_libs/release/out/lib'
91+
}
8692
}
8793
debug {
8894
minifyEnabled false
@@ -236,6 +242,7 @@ dependencies {
236242
implementation(libraries.crashlytics) {
237243
transitive = true
238244
}
245+
implementation libraries.crashlyticsNdk
239246

240247
testImplementation libraries.junit
241248
testImplementation libraries.robolectric
@@ -263,6 +270,10 @@ dependencies {
263270
releaseImplementation libraries.flipperNoop
264271
}
265272

273+
afterEvaluate {
274+
bundleRelease { finalizedBy(":app:uploadCrashlyticsSymbolFileRelease")}
275+
}
276+
266277
apply plugin: 'com.google.gms.google-services'
267278
if (getGradle().getStartParameter().getTaskRequests().toString().contains("Release")) {
268279
apply plugin: 'com.getkeepsafe.dexcount'

app/src/debug/java/org/stepik/android/domain/debug/model/SplitTestData.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package org.stepik.android.domain.debug.model
22

3-
import ru.nobird.android.core.model.Identifiable
3+
import ru.nobird.app.core.model.Identifiable
44

55
data class SplitTestData(
66
val splitTestName: String,

app/src/debug/java/org/stepik/android/presentation/debug/DebugViewModel.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package org.stepik.android.presentation.debug
22

3-
import ru.nobird.android.presentation.redux.container.ReduxViewContainer
3+
import ru.nobird.app.presentation.redux.container.ReduxViewContainer
44
import ru.nobird.android.view.redux.viewmodel.ReduxViewModel
55

66
class DebugViewModel(

app/src/debug/java/org/stepik/android/presentation/debug/InAppPurchasesViewModel.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package org.stepik.android.presentation.debug
22

3-
import ru.nobird.android.presentation.redux.container.ReduxViewContainer
43
import ru.nobird.android.view.redux.viewmodel.ReduxViewModel
4+
import ru.nobird.app.presentation.redux.container.ReduxViewContainer
55

66
class InAppPurchasesViewModel(
77
reduxViewContainer: ReduxViewContainer<InAppPurchasesFeature.State, InAppPurchasesFeature.Message, InAppPurchasesFeature.Action.ViewAction>

app/src/debug/java/org/stepik/android/presentation/debug/SplitTestsViewModel.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package org.stepik.android.presentation.debug
22

3-
import ru.nobird.android.presentation.redux.container.ReduxViewContainer
3+
import ru.nobird.app.presentation.redux.container.ReduxViewContainer
44
import ru.nobird.android.view.redux.viewmodel.ReduxViewModel
55

66
class SplitTestsViewModel(

app/src/debug/java/org/stepik/android/presentation/debug/reducer/DebugReducer.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import org.stepik.android.domain.debug.model.EndpointConfig
44
import org.stepik.android.presentation.debug.DebugFeature.State
55
import org.stepik.android.presentation.debug.DebugFeature.Message
66
import org.stepik.android.presentation.debug.DebugFeature.Action
7-
import ru.nobird.android.presentation.redux.reducer.StateReducer
7+
import ru.nobird.app.presentation.redux.reducer.StateReducer
88
import javax.inject.Inject
99

1010
class DebugReducer

app/src/debug/java/org/stepik/android/presentation/debug/reducer/InAppPurchasesReducer.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@ package org.stepik.android.presentation.debug.reducer
33
import org.stepik.android.presentation.debug.InAppPurchasesFeature.State
44
import org.stepik.android.presentation.debug.InAppPurchasesFeature.Message
55
import org.stepik.android.presentation.debug.InAppPurchasesFeature.Action
6-
import ru.nobird.android.core.model.mutate
76

8-
import ru.nobird.android.presentation.redux.reducer.StateReducer
7+
import ru.nobird.app.presentation.redux.reducer.StateReducer
98
import javax.inject.Inject
109

1110
class InAppPurchasesReducer

app/src/debug/java/org/stepik/android/presentation/debug/reducer/SplitTestsReducer.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package org.stepik.android.presentation.debug.reducer
33
import org.stepik.android.presentation.debug.SplitTestsFeature.State
44
import org.stepik.android.presentation.debug.SplitTestsFeature.Message
55
import org.stepik.android.presentation.debug.SplitTestsFeature.Action
6-
import ru.nobird.android.core.model.mutate
7-
import ru.nobird.android.presentation.redux.reducer.StateReducer
6+
import ru.nobird.app.core.model.mutate
7+
import ru.nobird.app.presentation.redux.reducer.StateReducer
88
import javax.inject.Inject
99

1010
class SplitTestsReducer

app/src/debug/java/org/stepik/android/view/debug/ui/activity/InAppPurchasesActivity.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import org.stepik.android.presentation.debug.InAppPurchasesFeature
2121
import org.stepik.android.presentation.debug.InAppPurchasesViewModel
2222
import org.stepik.android.view.debug.ui.adapter.delegate.InAppPurchaseAdapterDelegate
2323
import org.stepik.android.view.ui.delegate.ViewStateDelegate
24-
import ru.nobird.android.presentation.redux.container.ReduxView
24+
import ru.nobird.app.presentation.redux.container.ReduxView
2525
import ru.nobird.android.ui.adapters.DefaultDelegateAdapter
2626
import ru.nobird.android.view.redux.ui.extension.reduxViewModel
2727
import javax.inject.Inject

0 commit comments

Comments
 (0)