From 298111bd37a754c8105b89236dd1b601ccaf951b Mon Sep 17 00:00:00 2001 From: Josh Acay Date: Tue, 15 Feb 2022 15:44:00 -0500 Subject: [PATCH] Change package name to `io.github.apl_cornell`. (#80) * Add Spotless to buildSrc * Change group to io.github.apl_cornell * Move nativetools to io.github.apl_cornell --- build.gradle.kts | 4 +-- buildSrc/build.gradle.kts | 15 +++++++++- .../nativetools/CollectLibraryTask.kt | 28 +++++++++---------- .../nativetools/DockerCopy.kt | 2 +- .../nativetools/DockerCopyTask.kt | 2 +- .../nativetools/DownloadJNITask.kt | 4 +-- .../nativetools/Library.kt | 2 +- .../nativetools/SwigLibraryPlugin.kt | 8 +++--- .../nativetools/SwigLibraryPluginExtension.kt | 2 +- .../nativetools/Utility.kt | 2 +- .../nativetools/templates/BuildMakefile.kt | 2 +- .../nativetools/templates/CMakeLists.kt | 2 +- .../templates/DependenciesMakefile.kt | 2 +- .../nativetools/templates/Dockerfile.kt | 2 +- .../nativetools/templates/Dockerignore.kt | 2 +- .../nativetools/templates/GetMakefile.kt | 2 +- .../nativetools/templates/LibraryConstants.kt | 6 ++-- .../nativetools/templates/Platform.kt | 2 +- .../nativetools/templates/SwigMakefile.kt | 2 +- .../nativetools/templates/Template.kt | 2 +- .../profiles/x86_64-apple-darwin.cmake | 0 .../profiles/x86_64-apple-darwin.conan | 0 .../github/apl_cornell/aby/AbyRunner.java | 2 +- .../github/apl_cornell/aby/AbyTest.java | 2 +- .../github/apl_cornell/aby/BinaryGate.java | 2 +- .../apl_cornell/aby/CircuitBuilder.java | 2 +- 26 files changed, 57 insertions(+), 44 deletions(-) rename buildSrc/src/main/kotlin/{edu/cornell/cs/apl => io.github.apl_cornell}/nativetools/CollectLibraryTask.kt (84%) rename buildSrc/src/main/kotlin/{edu/cornell/cs/apl => io.github.apl_cornell}/nativetools/DockerCopy.kt (97%) rename buildSrc/src/main/kotlin/{edu/cornell/cs/apl => io.github.apl_cornell}/nativetools/DockerCopyTask.kt (97%) rename buildSrc/src/main/kotlin/{edu/cornell/cs/apl => io.github.apl_cornell}/nativetools/DownloadJNITask.kt (97%) rename buildSrc/src/main/kotlin/{edu/cornell/cs/apl => io.github.apl_cornell}/nativetools/Library.kt (95%) rename buildSrc/src/main/kotlin/{edu/cornell/cs/apl => io.github.apl_cornell}/nativetools/SwigLibraryPlugin.kt (95%) rename buildSrc/src/main/kotlin/{edu/cornell/cs/apl => io.github.apl_cornell}/nativetools/SwigLibraryPluginExtension.kt (77%) rename buildSrc/src/main/kotlin/{edu/cornell/cs/apl => io.github.apl_cornell}/nativetools/Utility.kt (94%) rename buildSrc/src/main/kotlin/{edu/cornell/cs/apl => io.github.apl_cornell}/nativetools/templates/BuildMakefile.kt (90%) rename buildSrc/src/main/kotlin/{edu/cornell/cs/apl => io.github.apl_cornell}/nativetools/templates/CMakeLists.kt (96%) rename buildSrc/src/main/kotlin/{edu/cornell/cs/apl => io.github.apl_cornell}/nativetools/templates/DependenciesMakefile.kt (92%) rename buildSrc/src/main/kotlin/{edu/cornell/cs/apl => io.github.apl_cornell}/nativetools/templates/Dockerfile.kt (98%) rename buildSrc/src/main/kotlin/{edu/cornell/cs/apl => io.github.apl_cornell}/nativetools/templates/Dockerignore.kt (64%) rename buildSrc/src/main/kotlin/{edu/cornell/cs/apl => io.github.apl_cornell}/nativetools/templates/GetMakefile.kt (96%) rename buildSrc/src/main/kotlin/{edu/cornell/cs/apl => io.github.apl_cornell}/nativetools/templates/LibraryConstants.kt (93%) rename buildSrc/src/main/kotlin/{edu/cornell/cs/apl => io.github.apl_cornell}/nativetools/templates/Platform.kt (95%) rename buildSrc/src/main/kotlin/{edu/cornell/cs/apl => io.github.apl_cornell}/nativetools/templates/SwigMakefile.kt (95%) rename buildSrc/src/main/kotlin/{edu/cornell/cs/apl => io.github.apl_cornell}/nativetools/templates/Template.kt (95%) rename buildSrc/src/main/resources/{edu/cornell/cs/apl => io/github/apl_cornell}/nativetools/profiles/x86_64-apple-darwin.cmake (100%) rename buildSrc/src/main/resources/{edu/cornell/cs/apl => io/github/apl_cornell}/nativetools/profiles/x86_64-apple-darwin.conan (100%) rename src/test/java/{com => io}/github/apl_cornell/aby/AbyRunner.java (96%) rename src/test/java/{com => io}/github/apl_cornell/aby/AbyTest.java (99%) rename src/test/java/{com => io}/github/apl_cornell/aby/BinaryGate.java (86%) rename src/test/java/{com => io}/github/apl_cornell/aby/CircuitBuilder.java (76%) diff --git a/build.gradle.kts b/build.gradle.kts index 6e0e7f4..8c77f39 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,4 +1,4 @@ -import edu.cornell.cs.apl.nativetools.Library +import io.github.apl_cornell.nativetools.Library import org.gradle.api.JavaVersion.VERSION_1_8 plugins { @@ -15,7 +15,7 @@ plugins { `swig-library` } -group = "com.github.apl-cornell" +group = "io.github.apl-cornell" // Compute version from GitHub tag if available System.getenv("GITHUB_REF")?.substringAfterLast('/')?.let { gitTag -> diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index d7479ff..e2dc7a7 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -1,5 +1,8 @@ plugins { `kotlin-dsl` + + // Style checking + id("com.diffplug.spotless") version "6.2.2" } repositories { @@ -10,11 +13,21 @@ dependencies { implementation("de.undercouch:gradle-download-task:4.1.1") } +spotless { + kotlin { + ktlint() + } + + kotlinGradle { + ktlint() + } +} + gradlePlugin { plugins { register("swig-library-plugin") { id = "swig-library" - implementationClass = "edu.cornell.cs.apl.nativetools.SwigLibraryPlugin" + implementationClass = "io.github.apl_cornell.nativetools.SwigLibraryPlugin" } } } diff --git a/buildSrc/src/main/kotlin/edu/cornell/cs/apl/nativetools/CollectLibraryTask.kt b/buildSrc/src/main/kotlin/io.github.apl_cornell/nativetools/CollectLibraryTask.kt similarity index 84% rename from buildSrc/src/main/kotlin/edu/cornell/cs/apl/nativetools/CollectLibraryTask.kt rename to buildSrc/src/main/kotlin/io.github.apl_cornell/nativetools/CollectLibraryTask.kt index 45edaee..b2d4a13 100644 --- a/buildSrc/src/main/kotlin/edu/cornell/cs/apl/nativetools/CollectLibraryTask.kt +++ b/buildSrc/src/main/kotlin/io.github.apl_cornell/nativetools/CollectLibraryTask.kt @@ -1,16 +1,16 @@ -package edu.cornell.cs.apl.nativetools - -import edu.cornell.cs.apl.nativetools.templates.LibraryConstants -import edu.cornell.cs.apl.nativetools.templates.Platform -import edu.cornell.cs.apl.nativetools.templates.buildMakefile -import edu.cornell.cs.apl.nativetools.templates.cmakeLists -import edu.cornell.cs.apl.nativetools.templates.dependenciesMakefile -import edu.cornell.cs.apl.nativetools.templates.dockerignore -import edu.cornell.cs.apl.nativetools.templates.getMakefile -import edu.cornell.cs.apl.nativetools.templates.linuxDockerfile -import edu.cornell.cs.apl.nativetools.templates.macosDockerfile -import edu.cornell.cs.apl.nativetools.templates.swigDockerfile -import edu.cornell.cs.apl.nativetools.templates.swigMakefile +package io.github.apl_cornell.nativetools + +import io.github.apl_cornell.nativetools.templates.LibraryConstants +import io.github.apl_cornell.nativetools.templates.Platform +import io.github.apl_cornell.nativetools.templates.buildMakefile +import io.github.apl_cornell.nativetools.templates.cmakeLists +import io.github.apl_cornell.nativetools.templates.dependenciesMakefile +import io.github.apl_cornell.nativetools.templates.dockerignore +import io.github.apl_cornell.nativetools.templates.getMakefile +import io.github.apl_cornell.nativetools.templates.linuxDockerfile +import io.github.apl_cornell.nativetools.templates.macosDockerfile +import io.github.apl_cornell.nativetools.templates.swigDockerfile +import io.github.apl_cornell.nativetools.templates.swigMakefile import org.gradle.api.DefaultTask import org.gradle.api.file.Directory import org.gradle.api.file.DirectoryProperty @@ -119,7 +119,7 @@ abstract class CollectLibraryTask : DefaultTask() { return val file = this.get().file(resource).asFile project.mkdir(file.parentFile) - file.writeBytes(resourceURL.readBytes()) + file.writeBytes(resourceURL!!.readBytes()) } /** Copies [file] into this directory and renames it to [name]. */ diff --git a/buildSrc/src/main/kotlin/edu/cornell/cs/apl/nativetools/DockerCopy.kt b/buildSrc/src/main/kotlin/io.github.apl_cornell/nativetools/DockerCopy.kt similarity index 97% rename from buildSrc/src/main/kotlin/edu/cornell/cs/apl/nativetools/DockerCopy.kt rename to buildSrc/src/main/kotlin/io.github.apl_cornell/nativetools/DockerCopy.kt index 0bb3bb2..7e537ca 100644 --- a/buildSrc/src/main/kotlin/edu/cornell/cs/apl/nativetools/DockerCopy.kt +++ b/buildSrc/src/main/kotlin/io.github.apl_cornell/nativetools/DockerCopy.kt @@ -1,4 +1,4 @@ -package edu.cornell.cs.apl.nativetools +package io.github.apl_cornell.nativetools import org.apache.tools.ant.util.TeeOutputStream import org.gradle.api.Project diff --git a/buildSrc/src/main/kotlin/edu/cornell/cs/apl/nativetools/DockerCopyTask.kt b/buildSrc/src/main/kotlin/io.github.apl_cornell/nativetools/DockerCopyTask.kt similarity index 97% rename from buildSrc/src/main/kotlin/edu/cornell/cs/apl/nativetools/DockerCopyTask.kt rename to buildSrc/src/main/kotlin/io.github.apl_cornell/nativetools/DockerCopyTask.kt index 6c38c61..c4a2ec3 100644 --- a/buildSrc/src/main/kotlin/edu/cornell/cs/apl/nativetools/DockerCopyTask.kt +++ b/buildSrc/src/main/kotlin/io.github.apl_cornell/nativetools/DockerCopyTask.kt @@ -1,4 +1,4 @@ -package edu.cornell.cs.apl.nativetools +package io.github.apl_cornell.nativetools import org.gradle.api.DefaultTask import org.gradle.api.file.Directory diff --git a/buildSrc/src/main/kotlin/edu/cornell/cs/apl/nativetools/DownloadJNITask.kt b/buildSrc/src/main/kotlin/io.github.apl_cornell/nativetools/DownloadJNITask.kt similarity index 97% rename from buildSrc/src/main/kotlin/edu/cornell/cs/apl/nativetools/DownloadJNITask.kt rename to buildSrc/src/main/kotlin/io.github.apl_cornell/nativetools/DownloadJNITask.kt index b91bd1a..5e207e0 100644 --- a/buildSrc/src/main/kotlin/edu/cornell/cs/apl/nativetools/DownloadJNITask.kt +++ b/buildSrc/src/main/kotlin/io.github.apl_cornell/nativetools/DownloadJNITask.kt @@ -1,7 +1,6 @@ -package edu.cornell.cs.apl.nativetools +package io.github.apl_cornell.nativetools import de.undercouch.gradle.tasks.download.DownloadAction -import java.io.File import org.gradle.api.DefaultTask import org.gradle.api.file.Directory import org.gradle.api.provider.Provider @@ -9,6 +8,7 @@ import org.gradle.api.tasks.Input import org.gradle.api.tasks.Internal import org.gradle.api.tasks.OutputDirectory import org.gradle.api.tasks.TaskAction +import java.io.File abstract class DownloadJNITask : DefaultTask() { @get:Internal diff --git a/buildSrc/src/main/kotlin/edu/cornell/cs/apl/nativetools/Library.kt b/buildSrc/src/main/kotlin/io.github.apl_cornell/nativetools/Library.kt similarity index 95% rename from buildSrc/src/main/kotlin/edu/cornell/cs/apl/nativetools/Library.kt rename to buildSrc/src/main/kotlin/io.github.apl_cornell/nativetools/Library.kt index 63cc428..2e79f7a 100644 --- a/buildSrc/src/main/kotlin/edu/cornell/cs/apl/nativetools/Library.kt +++ b/buildSrc/src/main/kotlin/io.github.apl_cornell/nativetools/Library.kt @@ -1,4 +1,4 @@ -package edu.cornell.cs.apl.nativetools +package io.github.apl_cornell.nativetools import org.gradle.api.tasks.Input import org.gradle.api.tasks.Internal diff --git a/buildSrc/src/main/kotlin/edu/cornell/cs/apl/nativetools/SwigLibraryPlugin.kt b/buildSrc/src/main/kotlin/io.github.apl_cornell/nativetools/SwigLibraryPlugin.kt similarity index 95% rename from buildSrc/src/main/kotlin/edu/cornell/cs/apl/nativetools/SwigLibraryPlugin.kt rename to buildSrc/src/main/kotlin/io.github.apl_cornell/nativetools/SwigLibraryPlugin.kt index 42ddec5..26d27a5 100644 --- a/buildSrc/src/main/kotlin/edu/cornell/cs/apl/nativetools/SwigLibraryPlugin.kt +++ b/buildSrc/src/main/kotlin/io.github.apl_cornell/nativetools/SwigLibraryPlugin.kt @@ -1,8 +1,7 @@ -package edu.cornell.cs.apl.nativetools +package io.github.apl_cornell.nativetools -import edu.cornell.cs.apl.nativetools.templates.LibraryConstants -import edu.cornell.cs.apl.nativetools.templates.Platform -import java.io.File +import io.github.apl_cornell.nativetools.templates.LibraryConstants +import io.github.apl_cornell.nativetools.templates.Platform import org.gradle.api.Plugin import org.gradle.api.Project import org.gradle.api.tasks.SourceSet @@ -11,6 +10,7 @@ import org.gradle.api.tasks.TaskProvider import org.gradle.kotlin.dsl.create import org.gradle.kotlin.dsl.getByType import org.gradle.kotlin.dsl.register +import java.io.File class SwigLibraryPlugin : Plugin { override fun apply(project: Project) { diff --git a/buildSrc/src/main/kotlin/edu/cornell/cs/apl/nativetools/SwigLibraryPluginExtension.kt b/buildSrc/src/main/kotlin/io.github.apl_cornell/nativetools/SwigLibraryPluginExtension.kt similarity index 77% rename from buildSrc/src/main/kotlin/edu/cornell/cs/apl/nativetools/SwigLibraryPluginExtension.kt rename to buildSrc/src/main/kotlin/io.github.apl_cornell/nativetools/SwigLibraryPluginExtension.kt index 4e588ad..fd998d2 100644 --- a/buildSrc/src/main/kotlin/edu/cornell/cs/apl/nativetools/SwigLibraryPluginExtension.kt +++ b/buildSrc/src/main/kotlin/io.github.apl_cornell/nativetools/SwigLibraryPluginExtension.kt @@ -1,4 +1,4 @@ -package edu.cornell.cs.apl.nativetools +package io.github.apl_cornell.nativetools import org.gradle.api.provider.ListProperty diff --git a/buildSrc/src/main/kotlin/edu/cornell/cs/apl/nativetools/Utility.kt b/buildSrc/src/main/kotlin/io.github.apl_cornell/nativetools/Utility.kt similarity index 94% rename from buildSrc/src/main/kotlin/edu/cornell/cs/apl/nativetools/Utility.kt rename to buildSrc/src/main/kotlin/io.github.apl_cornell/nativetools/Utility.kt index 55a5d9c..ea1f277 100644 --- a/buildSrc/src/main/kotlin/edu/cornell/cs/apl/nativetools/Utility.kt +++ b/buildSrc/src/main/kotlin/io.github.apl_cornell/nativetools/Utility.kt @@ -1,4 +1,4 @@ -package edu.cornell.cs.apl.nativetools +package io.github.apl_cornell.nativetools import org.gradle.api.file.Directory import org.gradle.api.file.RegularFile diff --git a/buildSrc/src/main/kotlin/edu/cornell/cs/apl/nativetools/templates/BuildMakefile.kt b/buildSrc/src/main/kotlin/io.github.apl_cornell/nativetools/templates/BuildMakefile.kt similarity index 90% rename from buildSrc/src/main/kotlin/edu/cornell/cs/apl/nativetools/templates/BuildMakefile.kt rename to buildSrc/src/main/kotlin/io.github.apl_cornell/nativetools/templates/BuildMakefile.kt index b2ccded..0ad76b6 100644 --- a/buildSrc/src/main/kotlin/edu/cornell/cs/apl/nativetools/templates/BuildMakefile.kt +++ b/buildSrc/src/main/kotlin/io.github.apl_cornell/nativetools/templates/BuildMakefile.kt @@ -1,4 +1,4 @@ -package edu.cornell.cs.apl.nativetools.templates +package io.github.apl_cornell.nativetools.templates /** Makefile for building the library. */ internal val buildMakefile = Makefile("build.mk") { diff --git a/buildSrc/src/main/kotlin/edu/cornell/cs/apl/nativetools/templates/CMakeLists.kt b/buildSrc/src/main/kotlin/io.github.apl_cornell/nativetools/templates/CMakeLists.kt similarity index 96% rename from buildSrc/src/main/kotlin/edu/cornell/cs/apl/nativetools/templates/CMakeLists.kt rename to buildSrc/src/main/kotlin/io.github.apl_cornell/nativetools/templates/CMakeLists.kt index bf6900f..deb4a5d 100644 --- a/buildSrc/src/main/kotlin/edu/cornell/cs/apl/nativetools/templates/CMakeLists.kt +++ b/buildSrc/src/main/kotlin/io.github.apl_cornell/nativetools/templates/CMakeLists.kt @@ -1,4 +1,4 @@ -package edu.cornell.cs.apl.nativetools.templates +package io.github.apl_cornell.nativetools.templates internal val cmakeLists = Template("CMakeLists.txt") { """ diff --git a/buildSrc/src/main/kotlin/edu/cornell/cs/apl/nativetools/templates/DependenciesMakefile.kt b/buildSrc/src/main/kotlin/io.github.apl_cornell/nativetools/templates/DependenciesMakefile.kt similarity index 92% rename from buildSrc/src/main/kotlin/edu/cornell/cs/apl/nativetools/templates/DependenciesMakefile.kt rename to buildSrc/src/main/kotlin/io.github.apl_cornell/nativetools/templates/DependenciesMakefile.kt index 300d84b..19e24d9 100644 --- a/buildSrc/src/main/kotlin/edu/cornell/cs/apl/nativetools/templates/DependenciesMakefile.kt +++ b/buildSrc/src/main/kotlin/io.github.apl_cornell/nativetools/templates/DependenciesMakefile.kt @@ -1,4 +1,4 @@ -package edu.cornell.cs.apl.nativetools.templates +package io.github.apl_cornell.nativetools.templates /** Makefile for downloading and installing the dependencies. */ internal val dependenciesMakefile = Makefile("dependencies.mk") { diff --git a/buildSrc/src/main/kotlin/edu/cornell/cs/apl/nativetools/templates/Dockerfile.kt b/buildSrc/src/main/kotlin/io.github.apl_cornell/nativetools/templates/Dockerfile.kt similarity index 98% rename from buildSrc/src/main/kotlin/edu/cornell/cs/apl/nativetools/templates/Dockerfile.kt rename to buildSrc/src/main/kotlin/io.github.apl_cornell/nativetools/templates/Dockerfile.kt index c6f3731..31dabf9 100644 --- a/buildSrc/src/main/kotlin/edu/cornell/cs/apl/nativetools/templates/Dockerfile.kt +++ b/buildSrc/src/main/kotlin/io.github.apl_cornell/nativetools/templates/Dockerfile.kt @@ -1,4 +1,4 @@ -package edu.cornell.cs.apl.nativetools.templates +package io.github.apl_cornell.nativetools.templates internal val swigDockerfile = Template("swig.dockerfile") { """ diff --git a/buildSrc/src/main/kotlin/edu/cornell/cs/apl/nativetools/templates/Dockerignore.kt b/buildSrc/src/main/kotlin/io.github.apl_cornell/nativetools/templates/Dockerignore.kt similarity index 64% rename from buildSrc/src/main/kotlin/edu/cornell/cs/apl/nativetools/templates/Dockerignore.kt rename to buildSrc/src/main/kotlin/io.github.apl_cornell/nativetools/templates/Dockerignore.kt index f796e91..22565c9 100644 --- a/buildSrc/src/main/kotlin/edu/cornell/cs/apl/nativetools/templates/Dockerignore.kt +++ b/buildSrc/src/main/kotlin/io.github.apl_cornell/nativetools/templates/Dockerignore.kt @@ -1,4 +1,4 @@ -package edu.cornell.cs.apl.nativetools.templates +package io.github.apl_cornell.nativetools.templates internal val dockerignore = Template(".dockerignore") { """ diff --git a/buildSrc/src/main/kotlin/edu/cornell/cs/apl/nativetools/templates/GetMakefile.kt b/buildSrc/src/main/kotlin/io.github.apl_cornell/nativetools/templates/GetMakefile.kt similarity index 96% rename from buildSrc/src/main/kotlin/edu/cornell/cs/apl/nativetools/templates/GetMakefile.kt rename to buildSrc/src/main/kotlin/io.github.apl_cornell/nativetools/templates/GetMakefile.kt index 847c40a..666c9ca 100644 --- a/buildSrc/src/main/kotlin/edu/cornell/cs/apl/nativetools/templates/GetMakefile.kt +++ b/buildSrc/src/main/kotlin/io.github.apl_cornell/nativetools/templates/GetMakefile.kt @@ -1,4 +1,4 @@ -package edu.cornell.cs.apl.nativetools.templates +package io.github.apl_cornell.nativetools.templates import java.nio.file.Path import java.nio.file.Paths diff --git a/buildSrc/src/main/kotlin/edu/cornell/cs/apl/nativetools/templates/LibraryConstants.kt b/buildSrc/src/main/kotlin/io.github.apl_cornell/nativetools/templates/LibraryConstants.kt similarity index 93% rename from buildSrc/src/main/kotlin/edu/cornell/cs/apl/nativetools/templates/LibraryConstants.kt rename to buildSrc/src/main/kotlin/io.github.apl_cornell/nativetools/templates/LibraryConstants.kt index 792ff3f..8eb5dba 100644 --- a/buildSrc/src/main/kotlin/edu/cornell/cs/apl/nativetools/templates/LibraryConstants.kt +++ b/buildSrc/src/main/kotlin/io.github.apl_cornell/nativetools/templates/LibraryConstants.kt @@ -1,7 +1,7 @@ -package edu.cornell.cs.apl.nativetools.templates +package io.github.apl_cornell.nativetools.templates -import edu.cornell.cs.apl.nativetools.Library -import edu.cornell.cs.apl.nativetools.SwigLibraryPlugin +import io.github.apl_cornell.nativetools.Library +import io.github.apl_cornell.nativetools.SwigLibraryPlugin import java.nio.file.Path import java.nio.file.Paths diff --git a/buildSrc/src/main/kotlin/edu/cornell/cs/apl/nativetools/templates/Platform.kt b/buildSrc/src/main/kotlin/io.github.apl_cornell/nativetools/templates/Platform.kt similarity index 95% rename from buildSrc/src/main/kotlin/edu/cornell/cs/apl/nativetools/templates/Platform.kt rename to buildSrc/src/main/kotlin/io.github.apl_cornell/nativetools/templates/Platform.kt index 1a5cfcf..b91c08d 100644 --- a/buildSrc/src/main/kotlin/edu/cornell/cs/apl/nativetools/templates/Platform.kt +++ b/buildSrc/src/main/kotlin/io.github.apl_cornell/nativetools/templates/Platform.kt @@ -1,4 +1,4 @@ -package edu.cornell.cs.apl.nativetools.templates +package io.github.apl_cornell.nativetools.templates /** Platforms we can generate native binaries for. */ internal enum class Platform { diff --git a/buildSrc/src/main/kotlin/edu/cornell/cs/apl/nativetools/templates/SwigMakefile.kt b/buildSrc/src/main/kotlin/io.github.apl_cornell/nativetools/templates/SwigMakefile.kt similarity index 95% rename from buildSrc/src/main/kotlin/edu/cornell/cs/apl/nativetools/templates/SwigMakefile.kt rename to buildSrc/src/main/kotlin/io.github.apl_cornell/nativetools/templates/SwigMakefile.kt index 44dfb6c..f26a3d2 100644 --- a/buildSrc/src/main/kotlin/edu/cornell/cs/apl/nativetools/templates/SwigMakefile.kt +++ b/buildSrc/src/main/kotlin/io.github.apl_cornell/nativetools/templates/SwigMakefile.kt @@ -1,4 +1,4 @@ -package edu.cornell.cs.apl.nativetools.templates +package io.github.apl_cornell.nativetools.templates /** Makefile for generating the Java interface using SWIG. */ internal val swigMakefile = Makefile("swig.mk") { diff --git a/buildSrc/src/main/kotlin/edu/cornell/cs/apl/nativetools/templates/Template.kt b/buildSrc/src/main/kotlin/io.github.apl_cornell/nativetools/templates/Template.kt similarity index 95% rename from buildSrc/src/main/kotlin/edu/cornell/cs/apl/nativetools/templates/Template.kt rename to buildSrc/src/main/kotlin/io.github.apl_cornell/nativetools/templates/Template.kt index 7960ac2..a7cc522 100644 --- a/buildSrc/src/main/kotlin/edu/cornell/cs/apl/nativetools/templates/Template.kt +++ b/buildSrc/src/main/kotlin/io.github.apl_cornell/nativetools/templates/Template.kt @@ -1,4 +1,4 @@ -package edu.cornell.cs.apl.nativetools.templates +package io.github.apl_cornell.nativetools.templates import org.gradle.api.file.Directory import org.gradle.api.provider.Provider diff --git a/buildSrc/src/main/resources/edu/cornell/cs/apl/nativetools/profiles/x86_64-apple-darwin.cmake b/buildSrc/src/main/resources/io/github/apl_cornell/nativetools/profiles/x86_64-apple-darwin.cmake similarity index 100% rename from buildSrc/src/main/resources/edu/cornell/cs/apl/nativetools/profiles/x86_64-apple-darwin.cmake rename to buildSrc/src/main/resources/io/github/apl_cornell/nativetools/profiles/x86_64-apple-darwin.cmake diff --git a/buildSrc/src/main/resources/edu/cornell/cs/apl/nativetools/profiles/x86_64-apple-darwin.conan b/buildSrc/src/main/resources/io/github/apl_cornell/nativetools/profiles/x86_64-apple-darwin.conan similarity index 100% rename from buildSrc/src/main/resources/edu/cornell/cs/apl/nativetools/profiles/x86_64-apple-darwin.conan rename to buildSrc/src/main/resources/io/github/apl_cornell/nativetools/profiles/x86_64-apple-darwin.conan diff --git a/src/test/java/com/github/apl_cornell/aby/AbyRunner.java b/src/test/java/io/github/apl_cornell/aby/AbyRunner.java similarity index 96% rename from src/test/java/com/github/apl_cornell/aby/AbyRunner.java rename to src/test/java/io/github/apl_cornell/aby/AbyRunner.java index 7222a82..94e6371 100644 --- a/src/test/java/com/github/apl_cornell/aby/AbyRunner.java +++ b/src/test/java/io/github/apl_cornell/aby/AbyRunner.java @@ -1,4 +1,4 @@ -package com.github.apl_cornell.aby; +package io.github.apl_cornell.aby; import java.util.concurrent.BlockingQueue; import java.util.concurrent.LinkedBlockingQueue; diff --git a/src/test/java/com/github/apl_cornell/aby/AbyTest.java b/src/test/java/io/github/apl_cornell/aby/AbyTest.java similarity index 99% rename from src/test/java/com/github/apl_cornell/aby/AbyTest.java rename to src/test/java/io/github/apl_cornell/aby/AbyTest.java index 94156cb..72ff0e2 100644 --- a/src/test/java/com/github/apl_cornell/aby/AbyTest.java +++ b/src/test/java/io/github/apl_cornell/aby/AbyTest.java @@ -1,4 +1,4 @@ -package com.github.apl_cornell.aby; +package io.github.apl_cornell.aby; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/src/test/java/com/github/apl_cornell/aby/BinaryGate.java b/src/test/java/io/github/apl_cornell/aby/BinaryGate.java similarity index 86% rename from src/test/java/com/github/apl_cornell/aby/BinaryGate.java rename to src/test/java/io/github/apl_cornell/aby/BinaryGate.java index 05dcf55..d3d8af5 100644 --- a/src/test/java/com/github/apl_cornell/aby/BinaryGate.java +++ b/src/test/java/io/github/apl_cornell/aby/BinaryGate.java @@ -1,4 +1,4 @@ -package com.github.apl_cornell.aby; +package io.github.apl_cornell.aby; /** * A supertype for binary-gate adding methods such as {@link Circuit#putADDGate(Share, Share)} and diff --git a/src/test/java/com/github/apl_cornell/aby/CircuitBuilder.java b/src/test/java/io/github/apl_cornell/aby/CircuitBuilder.java similarity index 76% rename from src/test/java/com/github/apl_cornell/aby/CircuitBuilder.java rename to src/test/java/io/github/apl_cornell/aby/CircuitBuilder.java index 32f1150..d88baf2 100644 --- a/src/test/java/com/github/apl_cornell/aby/CircuitBuilder.java +++ b/src/test/java/io/github/apl_cornell/aby/CircuitBuilder.java @@ -1,4 +1,4 @@ -package com.github.apl_cornell.aby; +package io.github.apl_cornell.aby; /** A function that builds a single-output circuit. */ interface CircuitBuilder {