Skip to content

Commit

Permalink
Merge pull request #40 from GwtMaterialDesign/release_2.5.0_rc1
Browse files Browse the repository at this point in the history
Release 2.5.0 rc1
  • Loading branch information
kevzlou7979 authored Feb 24, 2021
2 parents dcee9c5 + e7ced33 commit 6f2956b
Show file tree
Hide file tree
Showing 71 changed files with 6,290 additions and 1,017 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ cache:
- $HOME/.m2
before_install:
# install the gwt-material-jquery library before we build the demo
- git clone -b release_2.4.2 https://github.com/GwtMaterialDesign/gwt-material-jquery.git
- git clone -b release_2.5.0_rc1 https://github.com/GwtMaterialDesign/gwt-material-jquery.git
- cd gwt-material-jquery
- mvn install -DskipTests=true -DdryRun=true
- cd ..
# install the gwt-material library before we build the demo
- git clone -b release_2.4.2 https://github.com/GwtMaterialDesign/gwt-material.git
- git clone -b release_2.5.0_rc1 https://github.com/GwtMaterialDesign/gwt-material.git
- cd gwt-material
- mvn install -DskipTests=true -DdryRun=true
- cd ..
Expand Down
2 changes: 1 addition & 1 deletion .utility/deploy.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
set -ev
if [ "$TRAVIS_JDK_VERSION" == "oraclejdk8" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" == "release_2.4.2" ]; then
if [ "$TRAVIS_JDK_VERSION" == "oraclejdk8" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" == "release_2.5.0_rc1" ]; then
echo "<settings><servers><server><id>ossrh</id><username>\${env.OSSRH_USER}</username><password>\${env.OSSRH_PASS}</password></server></servers></settings>" > ~/settings.xml
mvn deploy --settings ~/settings.xml
fi
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Gwt Material Design Themes for https://github.com/GwtMaterialDesign/gwt-material
<dependency>
<groupId>com.github.gwtmaterialdesign</groupId>
<artifactId>gwt-material-themes</artifactId>
<version>2.4.2</version>
<version>2.5.0-rc1</version>
</dependency>
```

Expand Down
19 changes: 16 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<artifactId>gwt-material-parent</artifactId>
<groupId>com.github.gwtmaterialdesign</groupId>
<version>2.4.2</version>
<version>2.5.0-rc1</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand All @@ -27,7 +27,7 @@
<connection>scm:git:git@github.com:GwtMaterialDesign/gwt-material-themes.git</connection>
<developerConnection>scm:git:git@github.com:GwtMaterialDesign/gwt-material-themes.git</developerConnection>
<url>http://github.com/GwtMaterialDesign/gwt-material-themes</url>
<tag>v2.4.2</tag>
<tag>v2.5.0-rc1</tag>

</scm>

Expand Down Expand Up @@ -142,7 +142,7 @@

<profiles>
<profile>
<id>generateTheme</id>
<id>generate-all-themes</id>

<dependencies>
<dependency>
Expand Down Expand Up @@ -303,6 +303,19 @@
<generateSourceMap>false</generateSourceMap>
</configuration>
</execution>
<!-- Dark Theme -->
<execution>
<id>dark-theme</id>
<phase>package</phase>
<goals>
<goal>compile</goal>
</goals>
<configuration>
<inputPath>${sass.source}/dark</inputPath>
<outputPath>${sass.target}/dark/css</outputPath>
<generateSourceMap>false</generateSourceMap>
</configuration>
</execution>
</executions>
</plugin>

Expand Down
Loading

0 comments on commit 6f2956b

Please sign in to comment.