Rename org.jetbrains.jwm -> io.github.humbleui.jwm, build single jwm.…

…jar #147 #154

.github/workflows/build-deploy.yml

@@ -0,0 +1,84 @@
+name: Build and publish
+
+on:
+  push:
+    branches:
+      - main
+    tags:
+      - '[0-9]+.[0-9]+.[0-9]+'
+    paths-ignore:
+      - .gitignore
+      - 'docs/**'
+      - 'examples/**'
+      - 'extras/**'
+      - LICENSE
+      - README.md
+
+jobs:
+  build_linux:
+    runs-on: ubuntu-latest
+    container: tonsky/jwm:latest
+    steps:
+      - uses: actions/checkout@v2
+      - run: bash -c 'source /etc/profile && python3 script/build.py --only native'
+      - uses: actions/upload-artifact@v2
+        with:
+          name: native
+          path: linux/build/libjwm_x64.so
+
+  build_windows:
+    runs-on: windows-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: seanmiddleditch/gha-setup-ninja@master
+      - run: |
+          echo "JAVA_HOME=$JAVA_HOME_11_X64" >> $GITHUB_ENV
+          echo "$JAVA_HOME_11_X64/bin" >> $GITHUB_PATH
+        shell: bash
+      - uses: ilammy/msvc-dev-cmd@v1
+        with:
+          arch: amd64
+      - run: python3 script/build.py --only native
+      - uses: actions/upload-artifact@v2
+        with:
+          name: native
+          path: windows/build/jwm_x64.dll
+
+  build_macos:
+    runs-on: macos-10.15
+    needs: shared
+    steps:
+      - uses: actions/checkout@v2
+      - uses: seanmiddleditch/gha-setup-ninja@master
+      - run: |
+          echo "JAVA_HOME=$JAVA_HOME_11_X64" >> $GITHUB_ENV
+          echo "$JAVA_HOME_11_X64/bin" >> $GITHUB_PATH
+      - run: python3 script/build.py --arch=x64 --only native
+      - run: python3 script/build.py --arch=arm64 --only native
+      - uses: actions/upload-artifact@v2
+        with:
+          name: native
+          path: |
+            macos/build/libjwm_x64.dylib
+            macos/build/libjwm_arm64.dylib
+
+  deploy:
+    runs-on: ubuntu-latest
+    needs: [build_linux,build_windows,build_macos]
+    steps:
+      - uses: actions/checkout@v2
+      - run: |
+          echo "JAVA_HOME=$JAVA_HOME_11_X64" >> $GITHUB_ENV
+          echo "$JAVA_HOME_11_X64/bin" >> $GITHUB_PATH
+      - run: python3 script/build.py --only java
+      - uses: actions/download-artifact@v2
+        with:
+          name: native
+          path: target/classes
+      - run: python3 ./script/package.py --ref ${{ github.ref }}
+      - uses: actions/upload-artifact@v2
+        with:
+          name: jars
+          path: 'target/*.jar'
+      - if: startsWith(${{ github.ref }}, 'refs/tags/')
+        run: python3 ./script/deploy.py --ref ${{ github.ref }}

deploy/META-INF/maven/io.github.humbleui.jwm/jwm/pom.properties

@@ -0,0 +1,3 @@
+artifactId=jwm
+groupId=io.github.humbleui.jwm
+version=${version}

full/deploy/META-INF/maven/org.jetbrains.jwm/jwm-full/pom.xml → deploy/META-INF/maven/io.github.humbleui.jwm/jwm/pom.xml

@@ -1,8 +1,8 @@
 <project>
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.jetbrains.jwm</groupId>
-    <artifactId>jwm-full</artifactId>
-    <version>0.0.0-SNAPSHOT</version>
+    <groupId>io.github.humbleui.jwm</groupId>
+    <artifactId>jwm</artifactId>
+    <version>${version}</version>
     <properties>
         <maven.compiler.source>11</maven.compiler.source>
         <maven.compiler.target>11</maven.compiler.target>

docs/Conventions.md

@@ -24,7 +24,7 @@ Some common dictionary:
 
 - Use `*.cc` and `*.hh` for C++ files
 - All C++ code in `jwm` namespace
-- All public Java code in `org.jetbrains.jwm` namespace, implementation in `org.jetbrains.jwm.impl`
+- All public Java code in `io.github.humbleui.jwm` namespace, implementation in `io.github.humbleui.jwm.impl`
 - No inner classes
 
 # Visibility

docs/Getting Started.md

@@ -155,7 +155,7 @@ public void accept(Event e) {
 
 Simple key handling (e.g. for program shortcuts) via `EventKey`.
 Simple text input via `EventTextInput`.
-Advanced text input (IME) via `EventTextInputMarked` + `TextInputClient`. See [PanelTextInput.java](https://github.com/HumbleUI/JWM/blob/main/examples/java/org/jetbrains/jwm/examples/PanelTextInput.java) for hints how to handle IME input.
+Advanced text input (IME) via `EventTextInputMarked` + `TextInputClient`. See [PanelTextInput.java](https://github.com/HumbleUI/JWM/blob/main/examples/java/PanelTextInput.java) for hints how to handle IME input.
 
 ```java
 @Override
@@ -266,4 +266,4 @@ public void paint() {
 }
 ```
 
-For details on [Skija](https://github.com/jetbrains/skija) integration, consult `SkijaLayer*.java` in [examples](https://github.com/HumbleUI/JWM/tree/main/examples/java/org/jetbrains/jwm/examples) folder.
+For details on [Skija](https://github.com/jetbrains/skija) integration, consult `SkijaLayer*.java` in [examples](https://github.com/HumbleUI/JWM/tree/main/examples/java/) folder.

docs/GettingStarted.java

@@ -1,5 +1,5 @@
 import java.util.function.Consumer;
-import org.jetbrains.jwm.*;
+import io.github.humbleui.jwm.*;
 
 public class GettingStarted {
     public static void main(String[] args) {

examples/java/org/jetbrains/jwm/examples/Example.java → examples/java/Example.java

@@ -1,6 +1,6 @@
-package org.jetbrains.jwm.examples;
+package io.github.humbleui.jwm.examples;
 
-import org.jetbrains.jwm.*;
+import io.github.humbleui.jwm.*;
 import org.jetbrains.skija.*;
 
 import java.util.*;

examples/java/org/jetbrains/jwm/examples/Panel.java → examples/java/Panel.java

@@ -1,7 +1,7 @@
-package org.jetbrains.jwm.examples;
+package io.github.humbleui.jwm.examples;
 
 import java.util.function.*;
-import org.jetbrains.jwm.*;
+import io.github.humbleui.jwm.*;
 import org.jetbrains.skija.*;
 
 public abstract class Panel implements Consumer<Event> {

examples/java/org/jetbrains/jwm/examples/PanelAnimation.java → examples/java/PanelAnimation.java

@@ -1,6 +1,6 @@
-package org.jetbrains.jwm.examples;
+package io.github.humbleui.jwm.examples;
 
-import org.jetbrains.jwm.*;
+import io.github.humbleui.jwm.*;
 import org.jetbrains.skija.*;
 
 public class PanelAnimation extends Panel {

examples/java/org/jetbrains/jwm/examples/PanelEvents.java → examples/java/PanelEvents.java

@@ -1,7 +1,7 @@
-package org.jetbrains.jwm.examples;
+package io.github.humbleui.jwm.examples;
 
 import java.util.*;
-import org.jetbrains.jwm.*;
+import io.github.humbleui.jwm.*;
 import org.jetbrains.skija.*;
 
 public class PanelEvents extends Panel {

examples/java/org/jetbrains/jwm/examples/PanelLegend.java → examples/java/PanelLegend.java

@@ -1,7 +1,7 @@
-package org.jetbrains.jwm.examples;
+package io.github.humbleui.jwm.examples;
 
 import java.util.*;
-import org.jetbrains.jwm.*;
+import io.github.humbleui.jwm.*;
 import org.jetbrains.skija.*;
 
 public class PanelLegend extends Panel {

examples/java/org/jetbrains/jwm/examples/PanelMouse.java → examples/java/PanelMouse.java

@@ -1,10 +1,10 @@
-package org.jetbrains.jwm.examples;
+package io.github.humbleui.jwm.examples;
 
 import java.util.*;
 import java.util.function.*;
 import java.util.stream.*;
 
-import org.jetbrains.jwm.*;
+import io.github.humbleui.jwm.*;
 import org.jetbrains.skija.*;
 
 public class PanelMouse extends Panel {

examples/java/org/jetbrains/jwm/examples/PanelMouseCursors.java → examples/java/PanelMouseCursors.java

@@ -1,10 +1,10 @@
-package org.jetbrains.jwm.examples;
+package io.github.humbleui.jwm.examples;
 
 import java.util.*;
 import java.util.function.*;
 import java.util.stream.*;
 
-import org.jetbrains.jwm.*;
+import io.github.humbleui.jwm.*;
 import org.jetbrains.skija.*;
 
 public class PanelMouseCursors extends Panel {