Merge remote-tracking branch 'refs/remotes/origin/master'

egusator · Jun 13, 2024 · 4296724 · 4296724
2 parents 48a0a95 + bb88621
commit 4296724
Show file tree

Hide file tree

Showing 19 changed files with 50 additions and 11 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -76,3 +76,21 @@
 [submodule "app-mastodon"]
  path = app-mastodon
  url = https://github.com/luwrain/app-mastodon
+[submodule "app-diary"]
+ path = app-diary
+ url = https://github.com/luwrain/app-diary/
+[submodule "app-osm"]
+ path = app-osm
+ url = https://github.com/luwrain/app-osm
+[submodule "app-weather"]
+ path = app-weather
+ url = https://github.com/luwrain/app-weather
+[submodule "app-wiki"]
+ path = app-wiki
+ url = https://github.com/luwrain/app-wiki/
+[submodule "app-download"]
+ path = app-download
+ url = https://github.com/luwrain/app-download/
+[submodule "app-opds"]
+ path = app-opds
+ url = https://github.com/luwrain/app-opds/
diff --git a/app-diary b/app-diary
diff --git a/app-download b/app-download
diff --git a/app-mail b/app-mail
diff --git a/app-opds b/app-opds
diff --git a/app-osm b/app-osm
diff --git a/app-weather b/app-weather
diff --git a/app-wiki b/app-wiki
diff --git a/base b/base
diff --git a/browser b/browser
diff --git a/extensions b/extensions
diff --git a/i18n b/i18n
diff --git a/io b/io
diff --git a/luwrain b/luwrain
diff --git a/pim b/pim
diff --git a/player b/player
diff --git a/pom.xml b/pom.xml
@@ -98,6 +98,11 @@
  <artifactId>commons-vfs2</artifactId>
  <version>${vfs.version}</version>
  </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents.client5</groupId>
+ <artifactId>httpclient5</artifactId>
+ <version>5.3.1</version>
+ </dependency>
  <dependency>
  <groupId>org.apache.commons</groupId>
  <artifactId>commons-compress</artifactId>
@@ -113,6 +118,11 @@
  <artifactId>luwrain-books-api</artifactId>
  <version>0.2.0</version>
  </dependency>
+ <dependency>
+ <groupId>org.ton</groupId>
+ <artifactId>ton-kotlin-jvm</artifactId>
+ <version>0.2.18</version>
+ </dependency>
  <dependency>
  <groupId>org.graalvm.js</groupId>
  <artifactId>js</artifactId>
@@ -243,6 +253,11 @@
  <artifactId>lombok</artifactId>
  <version>${lombok.version}</version>
  </dependency>
+ <dependency>
+ <groupId>com.google.auto.service</groupId>
+ <artifactId>auto-service</artifactId>
+ <version>1.1.1</version>
+ </dependency>
  <dependency>
  <groupId>org.antlr</groupId>
  <artifactId>antlr4-runtime</artifactId>

diff --git a/reader b/reader
diff --git a/registry b/registry