Change package name to io.github.apl_cornell. (#80)

cacay · web-flow · commit 298111bd37a7 · 2022-02-15T15:44:00.000-05:00
* Add Spotless to buildSrc

* Change group to io.github.apl_cornell

* Move nativetools to io.github.apl_cornell
diff --git 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
@@ -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/io.github.apl_cornell/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/io.github.apl_cornell/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/io.github.apl_cornell/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/io.github.apl_cornell/nativetools/DownloadJNITask.kt b/buildSrc/src/main/kotlin/io.github.apl_cornell/nativetools/DownloadJNITask.kt
@@ -1,14 +1,14 @@
-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
 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/io.github.apl_cornell/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/io.github.apl_cornell/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<Project> {
     override fun apply(project: Project) {
diff --git a/buildSrc/src/main/kotlin/io.github.apl_cornell/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/io.github.apl_cornell/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/io.github.apl_cornell/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/io.github.apl_cornell/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/io.github.apl_cornell/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/io.github.apl_cornell/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/io.github.apl_cornell/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/io.github.apl_cornell/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/io.github.apl_cornell/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/io.github.apl_cornell/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/io.github.apl_cornell/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/io.github.apl_cornell/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/io/github/apl_cornell/nativetools/profiles/x86_64-apple-darwin.cmake b/buildSrc/src/main/resources/io/github/apl_cornell/nativetools/profiles/x86_64-apple-darwin.cmake
diff --git a/buildSrc/src/main/resources/io/github/apl_cornell/nativetools/profiles/x86_64-apple-darwin.conan b/buildSrc/src/main/resources/io/github/apl_cornell/nativetools/profiles/x86_64-apple-darwin.conan
diff --git a/src/test/java/io/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/io/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/io/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/io/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 {

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,8 @@`
`1`	`1`	`plugins {`
`2`	`2`	`kotlin-dsl`
	`3`	`+`
	`4`	`+ // Style checking`
	`5`	`+ id("com.diffplug.spotless") version "6.2.2"`
`3`	`6`	`}`
`4`	`7`
`5`	`8`	`repositories {`
`@@ -10,11 +13,21 @@ dependencies {`
`10`	`13`	`implementation("de.undercouch:gradle-download-task:4.1.1")`
`11`	`14`	`}`
`12`	`15`
	`16`	`+spotless {`
	`17`	`+ kotlin {`
	`18`	`+ ktlint()`
	`19`	`+ }`
	`20`	`+`
	`21`	`+ kotlinGradle {`
	`22`	`+ ktlint()`
	`23`	`+ }`
	`24`	`+}`
	`25`	`+`
`13`	`26`	`gradlePlugin {`
`14`	`27`	`plugins {`
`15`	`28`	`register("swig-library-plugin") {`
`16`	`29`	`id = "swig-library"`
`17`		`- implementationClass = "edu.cornell.cs.apl.nativetools.SwigLibraryPlugin"`
	`30`	`+ implementationClass = "io.github.apl_cornell.nativetools.SwigLibraryPlugin"`
`18`	`31`	`}`
`19`	`32`	`}`
`20`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package edu.cornell.cs.apl.nativetools`
	`1`	`+package io.github.apl_cornell.nativetools`
`2`	`2`
`3`	`3`	`import org.apache.tools.ant.util.TeeOutputStream`
`4`	`4`	`import org.gradle.api.Project`