Skip to content

Commit fd4ef97

Browse files
Merge pull request #45 from mustafaberkaymutlu/bugfix/reset
Fix reset() and resetCurrentTab() throwing IllegalArgumentException
2 parents 2dbc8e1 + a983321 commit fd4ef97

File tree

25 files changed

+548
-345
lines changed

25 files changed

+548
-345
lines changed

.github/workflows/pull-request.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
java-version: '11'
2424

2525
- name: Build
26-
run: ./gradlew assembleDebug --stacktrace
26+
run: ./gradlew assemble --stacktrace
2727

2828
test:
2929
runs-on: ubuntu-latest

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,4 +65,6 @@ fastlane/report.xml
6565
fastlane/Preview.html
6666
fastlane/screenshots
6767
fastlane/test_output
68-
fastlane/readme.md
68+
fastlane/readme.md
69+
70+
.DS_Store

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,18 +30,18 @@ Check out our [wiki](https://github.com/Trendyol/medusa/wiki)!
3030
## Setup
3131
```gradle
3232
dependencies {
33-
implementation 'com.trendyol:medusa:0.10.1'
33+
implementation 'com.trendyol:medusa:0.10.2'
3434
}
3535
```
3636

3737
## Icon Credits
38-
All credits goes to [Tatiana](https://dribbble.com/DarumaCreative)
38+
All credits go to [Tatiana](https://dribbble.com/DarumaCreative)
3939

4040
License
4141
--------
4242

4343

44-
Copyright 2018-2022 Trendyol.com
44+
Copyright 2018-2023 Trendyol.com
4545

4646
Licensed under the Apache License, Version 2.0 (the "License");
4747
you may not use this file except in compliance with the License.

app/build.gradle

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ apply plugin: 'com.android.application'
22
apply plugin: 'kotlin-android'
33

44
android {
5+
namespace 'com.trendyol.medusa'
56
compileSdkVersion 32
67
defaultConfig {
78
applicationId "com.trendyol.medusa"
@@ -26,19 +27,19 @@ android {
2627
}
2728

2829
dependencies {
29-
implementation project(':medusalib')
30-
implementation fileTree(include: ['*.jar'], dir: 'libs')
31-
implementation 'androidx.appcompat:appcompat:1.1.0'
32-
implementation 'com.google.android.material:material:1.0.0'
33-
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
34-
implementation 'androidx.vectordrawable:vectordrawable:1.1.0'
35-
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
30+
implementation projects.medusalib
3631

37-
testImplementation 'junit:junit:4.13.2'
38-
testImplementation 'org.robolectric:robolectric:4.8.1'
39-
testImplementation 'androidx.arch.core:core-testing:2.1.0'
40-
testImplementation 'androidx.test.ext:junit:1.1.3'
41-
testImplementation 'androidx.test:core-ktx:1.4.0'
32+
implementation libs.androidXAppCompat
33+
implementation libs.androidXConstraintLayout
34+
implementation libs.androidXVectorDrawable
35+
implementation libs.googleMaterial
36+
implementation libs.kotlinStdLib
37+
38+
testImplementation libs.androidXArchCoreTesting
39+
testImplementation libs.androidXTestCoreKtx
40+
testImplementation libs.androidXTestExtJunit
41+
testImplementation libs.junit
42+
testImplementation libs.robolectric
4243
}
4344
repositories {
4445
mavenCentral()

app/src/androidTest/java/com/trendyol/medusa/ExampleInstrumentedTest.java

Lines changed: 0 additions & 26 deletions
This file was deleted.

app/src/main/AndroidManifest.xml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest package="com.trendyol.medusa"
3-
xmlns:android="http://schemas.android.com/apk/res/android"
2+
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
43
xmlns:tools="http://schemas.android.com/tools">
54

65
<application
@@ -25,4 +24,4 @@
2524
android:label="@string/app_name_java"/>
2625
</application>
2726

28-
</manifest>
27+
</manifest>

app/src/test/java/com/trendyol/medusa/ExampleUnitTest.java

Lines changed: 0 additions & 17 deletions
This file was deleted.

build.gradle

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,13 @@
1-
// Top-level build file where you can add configuration options common to all sub-projects/modules.
2-
31
buildscript {
4-
ext.kotlin_version = '1.3.50'
5-
62
repositories {
73
google()
84
mavenCentral()
95
maven { url 'https://plugins.gradle.org/m2/' }
106
}
117
dependencies {
12-
classpath 'com.android.tools.build:gradle:7.2.2'
13-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
14-
classpath 'io.github.gradle-nexus:publish-plugin:1.1.0'
15-
16-
// NOTE: Do not place your application dependencies here; they belong
17-
// in the individual module build.gradle files
8+
classpath libs.androidGradlePlugin
9+
classpath libs.kotlinGradlePlugin
10+
classpath libs.nexusPublishPlugin
1811
}
1912
}
2013

gradle.properties

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@
88
# The setting is particularly useful for tweaking memory settings.
99
android.enableJetifier=true
1010
android.useAndroidX=true
11-
org.gradle.jvmargs=-Xmx1536m
12-
# When configured, Gradle will run in incubating parallel mode.
13-
# This option should only be used with decoupled projects. More details, visit
14-
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
15-
# org.gradle.parallel=true
11+
12+
org.gradle.jvmargs=-Xmx1536m -XX:+UseParallelGC -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
13+
org.gradle.caching=true
14+
org.gradle.configureondemand=true
15+
org.gradle.daemon=true
16+
org.gradle.parallel=true

gradle/libs.toml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
[libraries]
2+
androidGradlePlugin = "com.android.tools.build:gradle:7.4.1"
3+
androidXAppCompat = "androidx.appcompat:appcompat:1.1.0"
4+
androidXConstraintLayout = "androidx.constraintlayout:constraintlayout:1.1.3"
5+
androidXLifecycleCommon = "androidx.lifecycle:lifecycle-common:2.4.1"
6+
androidXVectorDrawable = "androidx.vectordrawable:vectordrawable:1.1.0"
7+
googleMaterial = "com.google.android.material:material:1.0.0"
8+
kotlinGradlePlugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
9+
kotlinStdLib = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk7", version.ref = "kotlin" }
10+
nexusPublishPlugin = "io.github.gradle-nexus:publish-plugin:1.1.0"
11+
12+
androidXArchCoreTesting = "androidx.arch.core:core-testing:2.1.0"
13+
androidXFragmentTesting = "androidx.fragment:fragment-testing:1.5.5"
14+
androidXTestCoreKtx = "androidx.test:core-ktx:1.4.0"
15+
androidXTestExtJunit = "androidx.test.ext:junit:1.1.3"
16+
junit = "junit:junit:4.13.2"
17+
robolectric = "org.robolectric:robolectric:4.9.2"
18+
truth = "com.google.truth:truth:1.1.3"
19+
20+
[versions]
21+
kotlin = "1.7.20"

0 commit comments

Comments
 (0)