Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion matrix/matrix-android/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryErro
#Tue Jun 20 10:24:33 CST 2017


VERSION_NAME_PREFIX=0.9.0
VERSION_NAME_PREFIX=0.9.1
VERSION_NAME_SUFFIX=
## two options: Internal (for wechat), External (for public repo)
PUBLISH_CHANNEL=Internal
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ abstract class MatrixTraceTask : DefaultTask() {
@get:Input
abstract val traceClassOutputDirectory: Property<String>

@get:OutputFiles
abstract val classOutputs: ConfigurableFileCollection

@get:OutputFile
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,9 @@
android:layout_height="match_parent">
<Toolbar
android:id="@+id/toolbar"
android:layout_height="@dimen/abc_action_bar_default_height_material"
android:layout_height="56dp"
android:layout_width="match_parent"
android:background="#ff009688"
app:navigationIcon="@drawable/back_icon_normal"
app:titleTextColor="#FFFFFF"
app:logo="@null">
android:background="#ff009688">
</Toolbar>
<FrameLayout
android:id="@+id/content"
Expand Down

This file was deleted.