Skip to content

Commit 9872e48

Browse files
authored
Merge pull request #148 from GwtMaterialDesign/release_2.0
Release 2.0-rc1 (WIP)
2 parents a35a84f + 84363ce commit 9872e48

File tree

225 files changed

+16360
-4509
lines changed

Some content is hidden

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

225 files changed

+16360
-4509
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
target/
22
gwt-material-addins.iml
33
.idea
4+
/war
5+
/gwt-unitCache

.travis.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,18 @@
11
sudo: false
22
language: java
33
jdk:
4-
- oraclejdk7
4+
- oraclejdk8
55
cache:
66
directories:
77
- $HOME/.m2
88
before_install:
9+
# install the gwt-material-jquery library before we build the demo
10+
- git clone -b master https://github.com/GwtMaterialDesign/gwt-material-jquery.git
11+
- cd gwt-material-jquery
12+
- mvn install -DskipTests=true -DdryRun=true
13+
- cd ..
914
# install the gwt-material library before we build the demo
10-
- git clone -b release_1.6.0 https://github.com/GwtMaterialDesign/gwt-material.git
15+
- git clone -b release_2.0 https://github.com/GwtMaterialDesign/gwt-material.git
1116
- cd gwt-material
1217
- mvn install -DskipTests=true -DdryRun=true
1318
- cd ..

.utility/deploy.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22
set -ev
3-
if [ "$TRAVIS_JDK_VERSION" == "oraclejdk7" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" == "release_1.6.0" ]; then
3+
if [ "$TRAVIS_JDK_VERSION" == "oraclejdk8" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" == "release_2.0" ]; then
44
echo "<settings><servers><server><id>ossrh</id><username>\${env.OSSRH_USER}</username><password>\${env.OSSRH_PASS}</password></server></servers></settings>" > ~/settings.xml
55
mvn deploy --settings ~/settings.xml
6-
fi
6+
fi

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Gwt Material Design Extra Components for https://github.com/GwtMaterialDesign/gw
99
<dependency>
1010
<groupId>com.github.gwtmaterialdesign</groupId>
1111
<artifactId>gwt-material-addins</artifactId>
12-
<version>1.6.2</version>
12+
<version>2.0-rc1</version>
1313
</dependency>
1414
```
1515

@@ -41,7 +41,7 @@ xmlns:ma="urn:import:gwt.material.design.addins.client"
4141
##Extra Components
4242
<ul>
4343
<li>Autcomplete</li>
44-
<li>Avatar (NEW)</li>
44+
<li>Avatar</li>
4545
<li>Bubble</li>
4646
<li>Camera</li>
4747
<li>Cutout</li>

pom.xml

Lines changed: 50 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<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">
3+
<modelVersion>4.0.0</modelVersion>
34
<parent>
45
<artifactId>gwt-material-parent</artifactId>
56
<groupId>com.github.gwtmaterialdesign</groupId>
6-
<version>1.6.2</version>
7+
<version>2.0-rc1</version>
78
</parent>
8-
<modelVersion>4.0.0</modelVersion>
99

1010
<artifactId>gwt-material-addins</artifactId>
1111

1212
<name>Gwt Material Addins</name>
13-
<version>1.6.2</version>
13+
<version>2.0-rc1</version>
1414
<description>Extra Components of GWT Material Framework</description>
1515

1616
<properties>
17-
<gwt-material.version>1.6.2</gwt-material.version>
17+
<gwt-material.version>2.0-rc1</gwt-material.version>
1818
</properties>
1919

2020
<scm>
2121
<connection>scm:git:[email protected]:GwtMaterialDesign/gwt-material-addins.git</connection>
2222
<developerConnection>scm:git:[email protected]:GwtMaterialDesign/gwt-material-addins.git</developerConnection>
2323
<url>http://github.com/GwtMaterialDesign/gwt-material-addins</url>
24-
<tag>v1.6.0</tag>
24+
<tag>v2.0-rc1</tag>
2525
</scm>
2626

2727
<licenses>
@@ -58,6 +58,12 @@
5858
<version>${gwt.version}</version>
5959
<scope>provided</scope>
6060
</dependency>
61+
<dependency>
62+
<groupId>com.google.gwt</groupId>
63+
<artifactId>gwt-dev</artifactId>
64+
<version>${gwt.version}</version>
65+
<scope>provided</scope>
66+
</dependency>
6167
<!-- Testing -->
6268
<dependency>
6369
<groupId>junit</groupId>
@@ -67,15 +73,51 @@
6773
</dependency>
6874
</dependencies>
6975

76+
<repositories>
77+
<repository>
78+
<id>central</id>
79+
<name>Central Repository</name>
80+
<url>https://repo.maven.apache.org/maven2</url>
81+
</repository>
82+
<repository>
83+
<id>sonatype-nexus-snapshot</id>
84+
<name>Sonatype Nexus snapshot repository</name>
85+
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
86+
</repository>
87+
</repositories>
88+
7089
<build>
7190
<plugins>
7291
<plugin>
73-
<groupId>org.codehaus.mojo</groupId>
74-
<artifactId>gwt-maven-plugin</artifactId>
92+
<artifactId>maven-surefire-plugin</artifactId>
93+
<version>2.6</version>
7594
<configuration>
76-
<validateOnly>true</validateOnly>
95+
<excludes>
96+
<exclude>**/*Test.java</exclude>
97+
</excludes>
98+
<includes>
99+
<include>**/GwtMaterialAddinsTest*.java</include>
100+
</includes>
101+
<additionalClasspathElements>
102+
<additionalClasspathElement>${project.build.sourceDirectory}</additionalClasspathElement>
103+
<additionalClasspathElement>${project.build.testSourceDirectory}</additionalClasspathElement>
104+
</additionalClasspathElements>
105+
<useManifestOnlyJar>false</useManifestOnlyJar>
106+
<forkMode>always</forkMode>
77107
</configuration>
78108
</plugin>
109+
<plugin>
110+
<groupId>org.codehaus.mojo</groupId>
111+
<artifactId>gwt-maven-plugin</artifactId>
112+
<version>${gwt-maven-plugin.version}</version>
113+
<executions>
114+
<execution>
115+
<goals>
116+
<goal>test</goal>
117+
</goals>
118+
</execution>
119+
</executions>
120+
</plugin>
79121
<plugin>
80122
<groupId>org.apache.maven.plugins</groupId>
81123
<artifactId>maven-compiler-plugin</artifactId>

src/main/java/gwt/material/design/addins/client/MaterialAddins.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
1-
package gwt.material.design.addins.client;
2-
31
/*
42
* #%L
53
* GwtMaterial
64
* %%
7-
* Copyright (C) 2015 GwtMaterialDesign
5+
* Copyright (C) 2015 - 2016 GwtMaterialDesign
86
* %%
97
* Licensed under the Apache License, Version 2.0 (the "License");
108
* you may not use this file except in compliance with the License.
@@ -19,6 +17,7 @@
1917
* limitations under the License.
2018
* #L%
2119
*/
20+
package gwt.material.design.addins.client;
2221

2322
import com.google.gwt.core.client.EntryPoint;
2423
import com.google.gwt.core.client.GWT;
@@ -35,7 +34,7 @@ public void onModuleLoad() {
3534
}
3635

3736
private static void checkStartupState() {
38-
if(startupState == null) {
37+
if (startupState == null) {
3938
startupState = GWT.create(StartupState.class);
4039
}
4140
}

src/main/java/gwt/material/design/addins/client/StartupState.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
1-
package gwt.material.design.addins.client;
2-
31
/*
42
* #%L
53
* GwtMaterial
64
* %%
7-
* Copyright (C) 2015 GwtMaterialDesign
5+
* Copyright (C) 2015 - 2016 GwtMaterialDesign
86
* %%
97
* Licensed under the Apache License, Version 2.0 (the "License");
108
* you may not use this file except in compliance with the License.
@@ -19,12 +17,14 @@
1917
* limitations under the License.
2018
* #L%
2119
*/
20+
package gwt.material.design.addins.client;
2221

2322
public class StartupState {
2423
public StartupState() {
2524
}
2625

2726
public static class DebugState extends StartupState {
28-
public DebugState() {}
27+
public DebugState() {
28+
}
2929
}
3030
}

0 commit comments

Comments
 (0)