Skip to content

Commit a523c2c

Browse files
authored
Merge pull request #255 from GwtMaterialDesign/release_2.0
Release 2.0
2 parents ff431a0 + 1f18a75 commit a523c2c

File tree

130 files changed

+6291
-4364
lines changed

Some content is hidden

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

130 files changed

+6291
-4364
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ cache:
77
- $HOME/.m2
88
before_install:
99
# install the gwt-material-jquery library before we build the demo
10-
- git clone -b master https://github.com/GwtMaterialDesign/gwt-material-jquery.git
10+
- git clone -b release_2.0 https://github.com/GwtMaterialDesign/gwt-material-jquery.git
1111
- cd gwt-material-jquery
1212
- mvn install -DskipTests=true -DdryRun=true
1313
- cd ..

README.md

Lines changed: 31 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Gwt Material Design Extra Components for https://github.com/GwtMaterialDesign/gw
1111
<dependency>
1212
<groupId>com.github.gwtmaterialdesign</groupId>
1313
<artifactId>gwt-material-addins</artifactId>
14-
<version>2.0-rc6</version>
14+
<version>2.0-rc7</version>
1515
</dependency>
1616
```
1717

@@ -40,37 +40,36 @@ xmlns:ma="urn:import:gwt.material.design.addins.client"
4040
<ma:timpicker:MaterialTimePicker placeholder="Time Arrival"/>
4141
```
4242

43-
## Extra Components
44-
<ul>
45-
<li>Autcomplete</li>
46-
<li>Avatar</li>
47-
<li>Bubble</li>
48-
<li>Camera</li>
49-
<li>ComboBox</li>
50-
<li>Cutout</li>
51-
<li>Document Viewer</li>
52-
<li>Dnd</li>
53-
<li>EmptyState (NEW) </li>
54-
<li>File Uploader</li>
55-
<li>Icon Morph</li>
56-
<li>Masonry</li>
57-
<li>Menubar</li>
58-
<li>Overlay</li>
59-
<li>Path Animator</li>
60-
<li>Popup Menu</li>
61-
<li>Rating</li>
62-
<li>Rich Editor</li>
63-
<li>Scrollfire</li>
64-
<li>SideProfile</li>
65-
<li>SplitPanel</li>
66-
<li>Steppers</li>
67-
<li>Subheader</li>
68-
<li>Swipeable</li>
69-
<li>Time Picker</li>
70-
<li>Tree View</li>
71-
<li>Waterfall</li>
72-
<li>Window</li>
73-
</ul>
43+
| Addin Name | Dependency | Version |
44+
| --- | --- | --- |
45+
| Autocomplete | N/A | N/A |
46+
| Avatar | [JDenticon](https://github.com/dmester/jdenticon) | 1.3.2 |
47+
| Bubble | N/A | N/A |
48+
| Camera | N/A | N/A |
49+
| ComboBox | [Select2](https://github.com/select2/select2) | 4.0.3 |
50+
| Cutout | N/A | N/A |
51+
| Document Viewer | N/A | N/A |
52+
| Dnd | [InteractJs](https://github.com/taye/interact.js) | 1.2.6 |
53+
| EmptyState | N/A | N/A |
54+
| File Uploader | [DropzoneJs](https://github.com/enyo/dropzone) | 4.3.0 |
55+
| Icon Morph | N/A | N/A |
56+
| Masonry | [Masonry](https://github.com/desandro/masonry) | 4.0.0 |
57+
| Menubar | N/A | N/A |
58+
| Overlay | N/A | N/A |
59+
| Path Animator | [CTAJs](https://github.com/chinchang/cta.js) | 0.3.2 |
60+
| Popup Menu | N/A | N/A |
61+
| Rating | N/A | N/A |
62+
| Rich Editor | [Material Note](https://github.com/Cerealkillerway/materialNote) | 1.2.1 |
63+
| Scrollfire | N/A | N/A |
64+
| SideProfile | N/A | N/A |
65+
| SplitPanel | [TouchSplitterJQuery](https://github.com/colelawrence/Touch-Splitter-jQuery) | 0.5.1 |
66+
| Steppers | N/A | N/A |
67+
| Subheader | N/A | N/A |
68+
| Swipeable | N/A | N/A |
69+
| Time Picker | [ClockPicker](https://github.com/weareoutman/clockpicker) | 0.0.7 |
70+
| Tree View | N/A | N/A |
71+
| Waterfall | N/A | N/A |
72+
| Window | N/A | N/A |
7473

7574
## Documentation
7675
We created [Java Docs](http://gwtmaterialdesign.github.io/gwt-material-demo/apidocs-addins/) for better understanding the usage of addins.

pom.xml

Lines changed: 26 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,28 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
34
<modelVersion>4.0.0</modelVersion>
45
<parent>
56
<artifactId>gwt-material-parent</artifactId>
67
<groupId>com.github.gwtmaterialdesign</groupId>
7-
<version>2.0-rc6</version>
8+
<version>2.0-rc7</version>
89
</parent>
910

1011
<artifactId>gwt-material-addins</artifactId>
1112

1213
<name>Gwt Material Addins</name>
13-
<version>2.0-rc6</version>
14+
<version>2.0-rc7</version>
1415
<description>Extra Components of GWT Material Framework</description>
1516

1617
<properties>
17-
<gwt-material.version>2.0-rc6</gwt-material.version>
18+
<gwt-material.version>2.0-rc7</gwt-material.version>
1819
</properties>
1920

2021
<scm>
2122
<connection>scm:git:[email protected]:GwtMaterialDesign/gwt-material-addins.git</connection>
2223
<developerConnection>scm:git:[email protected]:GwtMaterialDesign/gwt-material-addins.git</developerConnection>
2324
<url>http://github.com/GwtMaterialDesign/gwt-material-addins</url>
24-
<tag>v2.0-rc6</tag>
25+
<tag>v2.0-rc7</tag>
2526
</scm>
2627

2728
<licenses>
@@ -51,6 +52,25 @@
5152
<artifactId>gwt-material</artifactId>
5253
<version>${gwt-material.version}</version>
5354
</dependency>
55+
56+
<!-- GwtMaterial Test Jar -->
57+
<dependency>
58+
<groupId>com.github.gwtmaterialdesign</groupId>
59+
<artifactId>gwt-material</artifactId>
60+
<version>${gwt-material.version}</version>
61+
<type>test-jar</type>
62+
<scope>test</scope>
63+
</dependency>
64+
65+
<!-- GwtMaterial Test Sources -->
66+
<dependency>
67+
<groupId>com.github.gwtmaterialdesign</groupId>
68+
<artifactId>gwt-material</artifactId>
69+
<version>${gwt-material.version}</version>
70+
<classifier>test-sources</classifier>
71+
<scope>test</scope>
72+
</dependency>
73+
5474
<!-- Gwt -->
5575
<dependency>
5676
<groupId>com.google.gwt</groupId>
@@ -92,18 +112,13 @@
92112
<artifactId>maven-surefire-plugin</artifactId>
93113
<version>2.6</version>
94114
<configuration>
95-
<excludes>
96-
<exclude>**/*Test.java</exclude>
97-
</excludes>
98-
<includes>
99-
<include>**/GwtMaterialAddinsTest*.java</include>
100-
</includes>
101115
<additionalClasspathElements>
102116
<additionalClasspathElement>${project.build.sourceDirectory}</additionalClasspathElement>
103117
<additionalClasspathElement>${project.build.testSourceDirectory}</additionalClasspathElement>
104118
</additionalClasspathElements>
105119
<useManifestOnlyJar>false</useManifestOnlyJar>
106120
<forkMode>always</forkMode>
121+
<argLine>-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.NoOpLog</argLine>
107122
</configuration>
108123
</plugin>
109124
<plugin>

0 commit comments

Comments
 (0)