Skip to content

Commit

Permalink
Merge branch 'master' into master-androidx
Browse files Browse the repository at this point in the history
  • Loading branch information
xiaojinzi123 committed Mar 11, 2020
2 parents 46ebc80 + 8043610 commit 80a82d5
Show file tree
Hide file tree
Showing 14 changed files with 12 additions and 11 deletions.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
7233adf25497356d248a771f7fddde52
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
a6742271002ad15762ccd53d3353fa0fe3a9c9d7
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.xiaojinzi.component</groupId>
<artifactId>component-plugin</artifactId>
<version>1.8.0.1</version>
<version>1.8.0.2</version>
<dependencies>
<dependency>
<groupId>org.ow2.asm</groupId>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
6b7585d30606021d89c7f65eabc782a6
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
6b21e4fd6a980ce956174b55f6cd19c03f45b908
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,15 @@
<groupId>com.xiaojinzi.component</groupId>
<artifactId>component-plugin</artifactId>
<versioning>
<release>1.8.0.1</release>
<release>1.8.0.2</release>
<versions>
<version>1.7.7.3</version>
<version>1.7.8</version>
<version>1.7.9</version>
<version>1.8.0</version>
<version>1.8.0.1</version>
<version>1.8.0.2</version>
</versions>
<lastUpdated>20200303105906</lastUpdated>
<lastUpdated>20200311132403</lastUpdated>
</versioning>
</metadata>
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ffa3d8778b7e5e764f6fb919527fd19e
d2e5d77679ae199d753064890df63a13
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6b82073c07211b6c7ccf3a2e5d78acc1a3d6d84a
7351fc56d084ed82351e45974c3f6b9921b347bb
4 changes: 2 additions & 2 deletions dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ ext.versions = [
constraintLayout : '2.0.0-beta4',
rxjava : '2.2.18',
rxandroid : "2.1.1",
component_version : "1.8.0.1",
component_plugin_upload_version: "1.8.0.1"
component_version : "1.8.0.2",
component_plugin_upload_version: "1.8.0.2"
]

ext.libs = [
Expand Down

0 comments on commit 80a82d5

Please sign in to comment.