Skip to content

Commit f3f65d3

Browse files
authored
Merge pull request #1 from Omega-R/release/1.5.6
Release/1.5.6
2 parents 83c608d + ff56640 commit f3f65d3

File tree

318 files changed

+2550
-827
lines changed

Some content is hidden

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

318 files changed

+2550
-827
lines changed

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -76,22 +76,22 @@ Base modules integration:
7676
```groovy
7777
dependencies {
7878
...
79-
compile 'com.arello-mobile:moxy:1.5.5'
80-
annotationProcessor 'com.arello-mobile:moxy-compiler:1.5.5'
79+
compile 'com.arello-mobile:moxy:1.5.6'
80+
annotationProcessor 'com.arello-mobile:moxy-compiler:1.5.6'
8181
}
8282
```
8383
For additional base view classes `MvpActivity` and `MvpFragment` add this:
8484
```groovy
8585
dependencies {
8686
...
87-
compile 'com.arello-mobile:moxy-android:1.5.5'
87+
compile 'com.arello-mobile:moxy-android:1.5.6'
8888
}
8989
```
9090
If you are planning to use AppCompat, then you can use `MvpAppCompatActivity` and `MvpAppCompatFragment`. Then add this:
9191
```groovy
9292
dependencies {
9393
...
94-
compile 'com.arello-mobile:moxy-app-compat:1.5.5'
94+
compile 'com.arello-mobile:moxy-app-compat:1.5.6'
9595
compile 'com.android.support:appcompat-v7:$support_version'
9696
}
9797
```
@@ -102,7 +102,7 @@ apply plugin: 'kotlin-kapt'
102102
103103
dependencies {
104104
...
105-
kapt 'com.arello-mobile:moxy-compiler:1.5.5'
105+
kapt 'com.arello-mobile:moxy-compiler:1.5.6'
106106
}
107107
```
108108

build.gradle

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ buildscript {
77
google()
88
}
99
dependencies {
10-
classpath 'com.android.tools.build:gradle:3.1.2'
10+
classpath 'com.android.tools.build:gradle:3.2.1'
1111
}
1212
}
1313

@@ -20,20 +20,20 @@ allprojects {
2020
}
2121

2222
ext {
23-
targetVersionCode = 45
24-
targetVersionName = "1.5.5"
23+
targetVersionCode = 46
24+
targetVersionName = "1.5.6"
2525

2626
deps = [
2727
android : 'com.google.android:android:1.6_r2',
28-
javapoet : 'com.squareup:javapoet:1.9.0',
28+
javapoet : 'com.squareup:javapoet:1.10.0',
2929
junit : 'junit:junit:4.12',
3030
mockito : 'org.mockito:mockito-core:1.10.19',
3131
truth : 'com.google.truth:truth:0.34',
3232
robolectric : 'org.robolectric:robolectric:3.0',
33-
compiletesting: 'com.google.testing.compile:compile-testing:0.11',
33+
compiletesting: 'com.google.testing.compile:compile-testing:0.15',
3434
asm : ['org.ow2.asm:asm:6.0', 'org.ow2.asm:asm-util:6.0'],
35-
autoservice : 'com.google.auto.service:auto-service:1.0-rc3',
36-
autocommon : 'com.google.auto:auto-common:0.8',
35+
autoservice : 'com.google.auto.service:auto-service:1.0-rc4',
36+
autocommon : 'com.google.auto:auto-common:0.10',
3737
guava : 'com.google.guava:guava:21.0',
3838
]
3939
}
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Tue Jun 05 00:53:30 NOVT 2018
1+
#Sat Nov 24 23:06:24 NOVT 2018
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip

moxy-android/src/main/java/com/arellomobile/mvp/MvpActivity.java renamed to moxy-android/src/main/java/com/omegar/mvp/MvpActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.arellomobile.mvp;
1+
package com.omegar.mvp;
22

33
import android.app.Activity;
44
import android.os.Bundle;

moxy-android/src/main/java/com/arellomobile/mvp/MvpApplication.java renamed to moxy-android/src/main/java/com/omegar/mvp/MvpApplication.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.arellomobile.mvp;
1+
package com.omegar.mvp;
22

33
import android.app.Application;
44

moxy-android/src/main/java/com/arellomobile/mvp/MvpDialogFragment.java renamed to moxy-android/src/main/java/com/omegar/mvp/MvpDialogFragment.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.arellomobile.mvp;
1+
package com.omegar.mvp;
22

33
import android.app.DialogFragment;
44
import android.app.Fragment;

moxy-android/src/main/java/com/arellomobile/mvp/MvpFragment.java renamed to moxy-android/src/main/java/com/omegar/mvp/MvpFragment.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.arellomobile.mvp;
1+
package com.omegar.mvp;
22

33
import android.app.Fragment;
44
import android.os.Build;

moxy-androidx-sapmle/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/build

moxy-androidx-sapmle/build.gradle

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
buildscript {
2+
ext.kotlin_version = '1.3.10'
3+
repositories {
4+
google()
5+
jcenter()
6+
mavenCentral()
7+
}
8+
dependencies {
9+
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
10+
}
11+
}
12+
13+
apply plugin: 'com.android.application'
14+
apply plugin: 'kotlin-android'
15+
apply plugin: 'kotlin-kapt'
16+
apply plugin: 'kotlin-android-extensions'
17+
18+
android {
19+
compileSdkVersion 28
20+
21+
defaultConfig {
22+
applicationId "com.arellomobile.mvp.sample.androidx"
23+
minSdkVersion 16
24+
targetSdkVersion 28
25+
versionCode 1
26+
versionName "1.0"
27+
28+
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
29+
}
30+
31+
sourceSets {
32+
main.java.srcDirs += 'src/main/kotlin'
33+
}
34+
35+
buildTypes {
36+
release {
37+
minifyEnabled false
38+
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
39+
}
40+
}
41+
}
42+
43+
dependencies {
44+
implementation 'androidx.appcompat:appcompat:1.0.2'
45+
implementation project(':moxy')
46+
implementation project(':moxy-androidx')
47+
kapt project(':moxy-compiler')
48+
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
49+
}
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# Project-wide Gradle settings.
2+
3+
# IDE (e.g. Android Studio) users:
4+
# Gradle settings configured through the IDE *will override*
5+
# any settings specified in this file.
6+
7+
# For more details on how to configure your build environment visit
8+
# http://www.gradle.org/docs/current/userguide/build_environment.html
9+
10+
# Specifies the JVM arguments used for the daemon process.
11+
# The setting is particularly useful for tweaking memory settings.
12+
# Default value: -Xmx10248m -XX:MaxPermSize=256m
13+
# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
14+
15+
# When configured, Gradle will run in incubating parallel mode.
16+
# This option should only be used with decoupled projects. More details, visit
17+
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
18+
# org.gradle.parallel=true
19+
20+
#org.gradle.java.home=<path to jdk1.8 for tests>
21+
android.useAndroidX=true
22+
android.enableJetifier=true

0 commit comments

Comments
 (0)