Skip to content

Commit 6243836

Browse files
authored
Merge pull request #414 from wordpress-mobile/release/beta-4
Release/beta 4
2 parents 1b4e4de + 5d0087a commit 6243836

File tree

3 files changed

+11
-12
lines changed

3 files changed

+11
-12
lines changed

app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ dependencies {
3737
compile project(':wordpress-comments')
3838

3939
//noinspection GradleCompatible
40-
compile "com.android.support:appcompat-v7:25.4.0"
40+
compile "com.android.support:appcompat-v7:25.3.1"
4141
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
4242
compile "org.wordpress:utils:1.16.0"
4343
androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.2', {

aztec/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,15 @@ android {
2525
}
2626

2727
dependencies {
28-
compile "com.android.support:support-v4:25.4.0"
28+
compile "com.android.support:support-v4:25.3.1"
2929
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
3030
compile 'org.ccil.cowan.tagsoup:tagsoup:1.2.1'
3131
compile 'org.jsoup:jsoup:1.10.2'
3232

3333
testCompile 'junit:junit:4.12'
3434
testCompile 'org.robolectric:robolectric:3.3.2'
3535

36-
compile 'com.android.support:design:25.4.0'
36+
compile 'com.android.support:design:25.3.1'
3737
//https://github.com/robolectric/robolectric/issues/1932
3838
testCompile 'org.khronos:opengl-api:gl1.1-android-2.1_r1'
3939
}

aztec/src/main/kotlin/org/wordpress/aztec/Aztec.kt

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,14 @@ import java.util.*
1313
open class Aztec private constructor(val visualEditor: AztecText, val sourceEditor: SourceViewEditText,
1414
val toolbar: AztecToolbar, val toolbarClickListener: IAztecToolbarClickListener) {
1515

16-
var imageGetter: Html.ImageGetter? = null
17-
var videoThumbnailGetter: Html.VideoThumbnailGetter? = null
18-
var imeBackListener: AztecText.OnImeBackListener? = null
19-
var onTouchListener: View.OnTouchListener? = null
20-
var historyListener: IHistoryListener? = null
21-
var onImageTappedListener: AztecText.OnImageTappedListener? = null
22-
var onVideoTappedListener: AztecText.OnVideoTappedListener? = null
23-
24-
var plugins: ArrayList<IAztecPlugin> = visualEditor.plugins
16+
private var imageGetter: Html.ImageGetter? = null
17+
private var videoThumbnailGetter: Html.VideoThumbnailGetter? = null
18+
private var imeBackListener: AztecText.OnImeBackListener? = null
19+
private var onTouchListener: View.OnTouchListener? = null
20+
private var historyListener: IHistoryListener? = null
21+
private var onImageTappedListener: AztecText.OnImageTappedListener? = null
22+
private var onVideoTappedListener: AztecText.OnVideoTappedListener? = null
23+
private var plugins: ArrayList<IAztecPlugin> = visualEditor.plugins
2524

2625
init {
2726
initHistory()

0 commit comments

Comments
 (0)