Skip to content

Commit 9b74c8e

Browse files
huanhuan
committed
Merge branch 'master' of github.com:wechaty/java-wechaty
2 parents 4ae011e + e859cf8 commit 9b74c8e

File tree

21 files changed

+575
-518
lines changed

21 files changed

+575
-518
lines changed

‎README.md‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -279,20 +279,18 @@ We decided to use Kotlin to develop the Java Wechaty!
279279
- [Python Wechaty](https://github.com/wechaty/python-wechaty) - Python WeChat Bot SDK for Individual Account.
280280
- [Go Wechaty](https://github.com/wechaty/go-wechaty) - Go WeChat Bot SDK for Individual Account.
281281

282-
## Authors
283-
284-
- [@diaozxin007](https://github.com/diaozxin007) diaozxin@gmail.com
285-
- Website: [犀利豆的博客](https://xilidou.com/)
286-
- [@huan](https://github.com/huan) ([李卓桓](http://linkedin.com/in/zixia)), Tencent TVP of Chatbot, zixia@zixia.net
287-
288-
## Maintainers
282+
## Contributors
289283

290284
- [@redmaple1](https://github.com/redmaple1) Xiaoya Ren
291285

292-
See [MAINTAINERS](MAINTAINERS)
286+
## Committers
287+
288+
- [@diaozxin007](https://github.com/diaozxin007) diaozxin@gmail.com
289+
- Website: [犀利豆的博客](https://xilidou.com/)
290+
- [@huan](https://github.com/huan) - Huan LI ([李卓桓](http://linkedin.com/in/zixia)), Tencent TVP of Chatbot, zixia@zixia.net
293291

294292
## Copyright & License
295293

296-
- Code & Docs © 2020 Wechaty
294+
- Code & Docs © 2020 Wechaty Contributors <https://github.com/wechaty>
297295
- Code released under the Apache-2.0 License
298296
- Docs released under Creative Commons

‎pom.xml‎

Lines changed: 77 additions & 113 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,32 @@
22
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
33

44
<modelVersion>4.0.0</modelVersion>
5-
<groupId>io.wechaty</groupId>
5+
<groupId>io.github.wechaty</groupId>
66
<artifactId>wechaty-parent</artifactId>
77
<packaging>pom</packaging>
8-
<version>1.0.0-SNAPSOHOT</version>
8+
<version>1.0.0-SNAPSHOT</version>
99
<name>kotlin-wechaty</name>
1010

11+
<description>
12+
Wechaty is a Wechat Bot SDK for Personal Account that lets you create software to extend the functionality of the
13+
Wechat,
14+
writen in Node.js with TypeScript, Support all platforms including Linux, Windows, Darwin(OSX/Mac) and Docker.
15+
</description>
16+
<url>https://github.com/Chatie/grpc</url>
17+
18+
19+
1120
<properties>
1221
<kotlin.version>1.3.72</kotlin.version>
1322
<kotlin.compiler.jvmTarget>1.8</kotlin.compiler.jvmTarget>
1423
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1524
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
16-
<vertx.version>4.0.0-milestone4</vertx.version>
1725
<kotlin.compiler.incremental>true</kotlin.compiler.incremental>
26+
<dokka.version>0.10.1</dokka.version>
1827
</properties>
1928

29+
30+
2031
<modules>
2132
<module>wechaty</module>
2233
<module>wechaty-puppet</module>
@@ -38,30 +49,6 @@
3849
<version>${kotlin.version}</version>
3950
</dependency>
4051

41-
<!-- <dependency>-->
42-
<!-- <groupId>io.vertx</groupId>-->
43-
<!-- <artifactId>vertx-core</artifactId>-->
44-
<!-- <version>${vertx.version}</version>-->
45-
<!-- </dependency>-->
46-
<!-- <dependency>-->
47-
<!-- <groupId>io.vertx</groupId>-->
48-
<!-- <artifactId>vertx-lang-kotlin</artifactId>-->
49-
<!-- <version>${vertx.version}</version>-->
50-
<!-- </dependency>-->
51-
52-
<!-- <dependency>-->
53-
<!-- <groupId>io.vertx</groupId>-->
54-
<!-- <artifactId>vertx-grpc</artifactId>-->
55-
<!-- <version>${vertx.version}</version>-->
56-
<!-- </dependency>-->
57-
58-
<!-- <dependency>-->
59-
<!-- <groupId>io.vertx</groupId>-->
60-
<!-- <artifactId>vertx-web-client</artifactId>-->
61-
<!-- <version>${vertx.version}</version>-->
62-
<!-- </dependency>-->
63-
64-
6552
<!-- https://mvnrepository.com/artifact/org.apache.commons/commons-lang3 -->
6653
<dependency>
6754
<groupId>org.apache.commons</groupId>
@@ -178,108 +165,85 @@
178165
<version>3.4.2</version>
179166
</dependency>
180167

181-
<!-- &lt;!&ndash; https://mvnrepository.com/artifact/io.reactivex.rxjava2/rxjava &ndash;&gt;-->
182-
<!-- <dependency>-->
183-
<!-- <groupId>io.reactivex.rxjava2</groupId>-->
184-
<!-- <artifactId>rxjava</artifactId>-->
185-
<!-- <version>2.2.19</version>-->
186-
<!-- </dependency>-->
187-
188-
189-
190-
191-
<!-- <dependency>-->
192-
<!-- <groupId>io.grpc</groupId>-->
193-
<!-- <artifactId>grpc-netty-shaded</artifactId>-->
194-
<!-- <version>1.28.1</version>-->
195-
<!-- </dependency>-->
196-
<!-- <dependency>-->
197-
<!-- <groupId>io.grpc</groupId>-->
198-
<!-- <artifactId>grpc-protobuf</artifactId>-->
199-
<!-- <version>1.28.1</version>-->
200-
<!-- </dependency>-->
201-
<!-- <dependency>-->
202-
<!-- <groupId>io.grpc</groupId>-->
203-
<!-- <artifactId>grpc-stub</artifactId>-->
204-
<!-- <version>1.28.1</version>-->
205-
<!-- </dependency>-->
206-
207168
<!-- https://mvnrepository.com/artifact/io.grpc/grpc-kotlin-stub -->
208169
<dependency>
209170
<groupId>io.grpc</groupId>
210171
<artifactId>grpc-kotlin-stub</artifactId>
211172
<version>0.1.1</version>
212173
</dependency>
213174

214-
215-
<dependency>
216-
<groupId>io.netty</groupId>
217-
<artifactId>netty-transport-native-kqueue</artifactId>
218-
<version>4.1.48.Final</version>
219-
<classifier>osx-x86_64</classifier>
220-
</dependency>
221-
222-
<dependency>
223-
<groupId>io.netty</groupId>
224-
<artifactId>netty-transport-native-epoll</artifactId>
225-
<version>4.1.48.Final</version>
226-
<classifier>linux-x86_64</classifier>
227-
</dependency>
228-
229175
</dependencies>
230176
</dependencyManagement>
231177

232-
<!-- <dependencies>-->
233-
<!-- <dependency>-->
234-
<!-- <groupId>org.jetbrains.kotlin</groupId>-->
235-
<!-- <artifactId>kotlin-stdlib</artifactId>-->
236-
<!-- <version>${kotlin.version}</version>-->
237-
<!-- </dependency>-->
238-
<!-- </dependencies>-->
239-
240178
<build>
241179
<plugins>
242180
<plugin>
243181
<groupId>org.apache.maven.plugins</groupId>
244-
<artifactId>maven-compiler-plugin</artifactId>
245-
<version>3.6.1</version>
246-
<configuration>
247-
<source>1.8</source>
248-
<target>1.8</target>
249-
</configuration>
182+
<artifactId>maven-gpg-plugin</artifactId>
183+
<version>1.6</version>
184+
<executions>
185+
<execution>
186+
<id>sign-artifacts</id>
187+
<phase>verify</phase>
188+
<goals>
189+
<goal>sign</goal>
190+
</goals>
191+
<configuration>
192+
<gpgArguments>
193+
<arg>--pinentry-mode</arg>
194+
<arg>loopback</arg>
195+
</gpgArguments>
196+
</configuration>
197+
</execution>
198+
</executions>
250199
</plugin>
251-
<!-- <plugin>-->
252-
<!-- <groupId>org.jetbrains.kotlin</groupId>-->
253-
<!-- <artifactId>kotlin-maven-plugin</artifactId>-->
254-
<!-- <version>${kotlin.version}</version>-->
255-
<!-- <executions>-->
256-
<!-- <execution>-->
257-
<!-- <id>compile</id>-->
258-
<!-- <goals>-->
259-
<!-- <goal>compile</goal>-->
260-
<!-- </goals>-->
261-
<!-- <configuration>-->
262-
<!-- <sourceDirs>-->
263-
<!-- <sourceDir>${project.basedir}/src/main/kotlin</sourceDir>-->
264-
<!-- <sourceDir>${project.basedir}/src/main/java</sourceDir>-->
265-
<!-- </sourceDirs>-->
266-
<!-- </configuration>-->
267-
<!-- </execution>-->
268-
<!-- <execution>-->
269-
<!-- <id>test-compile</id>-->
270-
<!-- <goals>-->
271-
<!-- <goal>test-compile</goal>-->
272-
<!-- </goals>-->
273-
<!-- <configuration>-->
274-
<!-- <sourceDirs>-->
275-
<!-- <sourceDir>${project.basedir}/src/test/kotlin</sourceDir>-->
276-
<!-- <sourceDir>${project.basedir}/src/test/java</sourceDir>-->
277-
<!-- </sourceDirs>-->
278-
<!-- </configuration>-->
279-
<!-- </execution>-->
280-
<!-- </executions>-->
281-
<!-- </plugin>-->
282200
</plugins>
283201
</build>
284202

203+
204+
<contributors>
205+
<contributor>
206+
<name>Zhengxin Diao</name>
207+
<email>diaozxin@gmail.com</email>
208+
</contributor>
209+
<contributor>
210+
<name>Xiaoya ren</name>
211+
</contributor>
212+
</contributors>
213+
214+
<licenses>
215+
<license>
216+
<name>Apache License, Version 2.0</name>
217+
<url>http://www.apache.org/licenses/LICENSE-2.0</url>
218+
</license>
219+
</licenses>
220+
221+
<developers>
222+
<developer>
223+
<name>Zhengxin Diao</name>
224+
<email>diaozxin@gmail.com</email>
225+
</developer>
226+
<developer>
227+
<name>Xiaoya ren</name>
228+
</developer>
229+
</developers>
230+
231+
<distributionManagement>
232+
<snapshotRepository>
233+
<id>sonatype</id>
234+
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
235+
</snapshotRepository>
236+
<repository>
237+
<id>sonatype</id>
238+
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
239+
</repository>
240+
</distributionManagement>
241+
242+
<scm>
243+
<url>https://github.com/Chatie/grpc</url>
244+
<connection>scm:git:ssh://github.com/Chatie/grpc.git</connection>
245+
<developerConnection>scm:git:ssh://git@github.com/Chatie/grpc.git</developerConnection>
246+
<tag>HEAD</tag>
247+
</scm>
248+
285249
</project>

0 commit comments

Comments
 (0)