Skip to content

Commit

Permalink
ch.jodersky => com.github.sbt packages rename
Browse files Browse the repository at this point in the history
  • Loading branch information
pomadchin committed Jul 26, 2021
1 parent 94a2cc1 commit c3841f0
Show file tree
Hide file tree
Showing 37 changed files with 61 additions and 61 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ This plugin enables loading native libraries in a safe and transparent manner to

#### Example use (Scala 2.x):
```scala
import ch.jodersky.jni.nativeLoader
import com.github.sbt.jni.nativeLoader

// By adding this annotation, there is no need to call
// System.load("adder0") before accessing native methods.
Expand Down Expand Up @@ -124,7 +124,7 @@ sbtJniCoreScope := <Configuration>
```scala
// to make the code below work the core project should be included as a dependency via
// sbtJniCoreScope := Compile
import ch.jodersky.jni.syntax.NativeLoader
import com.github.sbt.jni.syntax.NativeLoader

// By adding this annotation, there is no need to call
// System.load("adder0") before accessing native methods.
Expand Down
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ lazy val plugin = project
// make project settings available to source
Compile / sourceGenerators += Def.task {
val src = s"""|/* Generated by sbt */
|package ch.jodersky.sbt.jni
|package com.github.sbt.jni
|
|private[jni] object ProjectVersion {
| final val MacrosParadise = "${macrosParadiseVersion}"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ch.jodersky.jni
package com.github.sbt.jni

object Process {
def out(command: String): String =
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ch.jodersky.jni
package com.github.sbt.jni

import scala.language.experimental.macros
import scala.reflect.macros.whitebox.Context
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ch.jodersky.jni
package com.github.sbt.jni

object Process {
def out(command: String): String =
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package ch.jodersky.jni.syntax
package com.github.sbt.jni.syntax

import ch.jodersky.jni.Process
import com.github.sbt.jni.Process

import java.nio.file.{Files, Path}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package ch.jodersky.sbt.jni.javah;
package com.github.sbt.jni.javah;

import java.util.Objects;

import static ch.jodersky.sbt.jni.javah.util.Utils.*;
import static com.github.sbt.jni.javah.util.Utils.*;

public final class ClassName {
private final String moduleName;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package ch.jodersky.sbt.jni.javah;
package com.github.sbt.jni.javah;

import ch.jodersky.sbt.jni.javah.search.ClassPath;
import ch.jodersky.sbt.jni.javah.search.ModulePath;
import ch.jodersky.sbt.jni.javah.search.RuntimeSearchPath;
import ch.jodersky.sbt.jni.javah.search.SearchPath;
import ch.jodersky.sbt.jni.javah.util.JNIGenerator;
import com.github.sbt.jni.javah.search.ClassPath;
import com.github.sbt.jni.javah.search.ModulePath;
import com.github.sbt.jni.javah.search.RuntimeSearchPath;
import com.github.sbt.jni.javah.search.SearchPath;
import com.github.sbt.jni.javah.util.JNIGenerator;

import java.io.PrintWriter;
import java.io.Writer;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ch.jodersky.sbt.jni.javah.resource;
package com.github.sbt.jni.javah.resource;

import java.util.Locale;
import java.util.ResourceBundle;
Expand All @@ -11,7 +11,7 @@ public final class Resource {
}

public static void reload(Locale locale) {
text = ResourceBundle.getBundle("ch.jodersky.sbt.jni.javah.resource.Text", locale);
text = ResourceBundle.getBundle("com.github.sbt.jni.javah.resource.Text", locale);
}

public static String getText(String key) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ch.jodersky.sbt.jni.javah.resource;
package com.github.sbt.jni.javah.resource;

import java.util.ListResourceBundle;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ch.jodersky.sbt.jni.javah.resource;
package com.github.sbt.jni.javah.resource;

import java.util.ListResourceBundle;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package ch.jodersky.sbt.jni.javah.search;
package com.github.sbt.jni.javah.search;

import ch.jodersky.sbt.jni.javah.ClassName;
import com.github.sbt.jni.javah.ClassName;

import java.nio.file.Path;
import java.util.Collections;
import java.util.List;
import java.util.Objects;

import static ch.jodersky.sbt.jni.javah.util.Utils.*;
import static com.github.sbt.jni.javah.util.Utils.*;

public class ClassPath implements SearchPath {
private final Path path;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package ch.jodersky.sbt.jni.javah.search;
package com.github.sbt.jni.javah.search;

import ch.jodersky.sbt.jni.javah.ClassName;
import ch.jodersky.sbt.jni.javah.util.Utils;
import com.github.sbt.jni.javah.ClassName;
import com.github.sbt.jni.javah.util.Utils;

import java.io.IOException;
import java.nio.file.Files;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package ch.jodersky.sbt.jni.javah.search;
package com.github.sbt.jni.javah.search;

import ch.jodersky.sbt.jni.javah.ClassName;
import com.github.sbt.jni.javah.ClassName;

import java.io.IOException;
import java.net.URI;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package ch.jodersky.sbt.jni.javah.search;
package com.github.sbt.jni.javah.search;

import ch.jodersky.sbt.jni.javah.ClassName;
import com.github.sbt.jni.javah.ClassName;

import java.io.IOException;
import java.io.InputStream;
Expand All @@ -10,7 +10,7 @@
import java.util.jar.Manifest;
import java.util.stream.Collectors;

import static ch.jodersky.sbt.jni.javah.util.Utils.*;
import static com.github.sbt.jni.javah.util.Utils.*;

public interface SearchPath {
Path search(ClassName name);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package ch.jodersky.sbt.jni.javah.util;
package com.github.sbt.jni.javah.util;

import ch.jodersky.sbt.jni.javah.ClassName;
import com.github.sbt.jni.javah.ClassName;
import org.objectweb.asm.*;

import java.util.*;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package ch.jodersky.sbt.jni.javah.util;
package com.github.sbt.jni.javah.util;

import java.util.Arrays;
import java.util.List;
import java.util.Objects;

import static ch.jodersky.sbt.jni.javah.util.Utils.*;
import static com.github.sbt.jni.javah.util.Utils.*;

public final class Constant {
private static final List<Class<?>> TYPES = Arrays.asList(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package ch.jodersky.sbt.jni.javah.util;
package com.github.sbt.jni.javah.util;

import ch.jodersky.sbt.jni.javah.ClassName;
import ch.jodersky.sbt.jni.javah.search.RuntimeSearchPath;
import ch.jodersky.sbt.jni.javah.search.SearchPath;
import com.github.sbt.jni.javah.ClassName;
import com.github.sbt.jni.javah.search.RuntimeSearchPath;
import com.github.sbt.jni.javah.search.SearchPath;
import org.objectweb.asm.ClassReader;
import org.objectweb.asm.Type;

Expand All @@ -11,7 +11,7 @@
import java.nio.file.Path;
import java.util.*;

import static ch.jodersky.sbt.jni.javah.util.Utils.*;
import static com.github.sbt.jni.javah.util.Utils.*;

public class JNIGenerator {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package ch.jodersky.sbt.jni.javah.util;
package com.github.sbt.jni.javah.util;

import org.objectweb.asm.Opcodes;
import org.objectweb.asm.Type;

import java.util.Objects;
import java.util.regex.Matcher;

import static ch.jodersky.sbt.jni.javah.util.Utils.*;
import static com.github.sbt.jni.javah.util.Utils.*;

public final class NativeMethod {
private final int access;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package ch.jodersky.sbt.jni.javah.util;
package com.github.sbt.jni.javah.util;

import ch.jodersky.sbt.jni.javah.ClassName;
import com.github.sbt.jni.javah.ClassName;
import org.objectweb.asm.ClassReader;
import org.objectweb.asm.ClassVisitor;
import org.objectweb.asm.Opcodes;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ch.jodersky.sbt.jni
package com.github.sbt.jni
package build

import java.io.File
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ch.jodersky.sbt.jni
package com.github.sbt.jni
package build

import java.io.File
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ch.jodersky.sbt.jni
package com.github.sbt.jni
package build

import sbt._
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ch.jodersky.sbt.jni.build
package com.github.sbt.jni.build

import sbt._

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ch.jodersky.sbt.jni
package com.github.sbt.jni
package build

import java.io.File
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ch.jodersky.sbt.jni
package com.github.sbt.jni
package plugins

import java.net.URI
Expand Down Expand Up @@ -59,7 +59,7 @@ object JniJavah extends AutoPlugin {
javah := {
val out = (javah / target).value

val task = new ch.jodersky.sbt.jni.javah.JavahTask
val task = new com.github.sbt.jni.javah.JavahTask

val log = streams.value.log

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ch.jodersky.sbt.jni
package com.github.sbt.jni
package plugins

import sbt._
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ch.jodersky.sbt.jni
package com.github.sbt.jni
package plugins

import build._
Expand Down Expand Up @@ -36,7 +36,7 @@ object JniNative extends AutoPlugin {
val nativeBuildToolInstance = taskKey[BuildTool#Instance]("Get an instance of the current native build tool.")

lazy val settings: Seq[Setting[_]] = Seq(
// the value retruned must match that of `ch.jodersky.jni.PlatformMacros#current()` of project `macros`
// the value retruned must match that of `com.github.sbt.jni.PlatformMacros#current()` of project `macros`
nativePlatform := {
try {
val lines = Process("uname -sm").lineStream
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ch.jodersky.sbt.jni
package com.github.sbt.jni
package plugins

import sbt._
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ch.jodersky.sbt.jni
package com.github.sbt.jni
package util

import java.io.{Closeable, File, FileInputStream}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package multiclasses

import ch.jodersky.jni.nativeLoader
import com.github.sbt.jni.nativeLoader

case class Value(x: Int)

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package multiclasses

import ch.jodersky.jni.nativeLoader
import com.github.sbt.jni.nativeLoader

@nativeLoader("multiplier1")
abstract class Multiplier {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package simplecargo

import ch.jodersky.jni.nativeLoader
import com.github.sbt.jni.nativeLoader

@nativeLoader("adder")
class Adder(val base: Int) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package simple

import ch.jodersky.jni.syntax.NativeLoader
import com.github.sbt.jni.syntax.NativeLoader

object Library extends NativeLoader("demo0") {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package simple

import ch.jodersky.jni.nativeLoader
import com.github.sbt.jni.nativeLoader

@nativeLoader("demo0")
object Library {
Expand Down

0 comments on commit c3841f0

Please sign in to comment.