Skip to content

Commit 298111b

Browse files
cacaycacay
authored
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
1 parent 07f64ef commit 298111b

26 files changed

+57
-44
lines changed

‎build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import edu.cornell.cs.apl.nativetools.Library
1+
import io.github.apl_cornell.nativetools.Library
22
import org.gradle.api.JavaVersion.VERSION_1_8
33

44
plugins {
@@ -15,7 +15,7 @@ plugins {
1515
`swig-library`
1616
}
1717

18-
group = "com.github.apl-cornell"
18+
group = "io.github.apl-cornell"
1919

2020
// Compute version from GitHub tag if available
2121
System.getenv("GITHUB_REF")?.substringAfterLast('/')?.let { gitTag ->

‎buildSrc/build.gradle.kts‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
plugins {
22
`kotlin-dsl`
3+
4+
// Style checking
5+
id("com.diffplug.spotless") version "6.2.2"
36
}
47

58
repositories {
@@ -10,11 +13,21 @@ dependencies {
1013
implementation("de.undercouch:gradle-download-task:4.1.1")
1114
}
1215

16+
spotless {
17+
kotlin {
18+
ktlint()
19+
}
20+
21+
kotlinGradle {
22+
ktlint()
23+
}
24+
}
25+
1326
gradlePlugin {
1427
plugins {
1528
register("swig-library-plugin") {
1629
id = "swig-library"
17-
implementationClass = "edu.cornell.cs.apl.nativetools.SwigLibraryPlugin"
30+
implementationClass = "io.github.apl_cornell.nativetools.SwigLibraryPlugin"
1831
}
1932
}
2033
}

‎buildSrc/src/main/kotlin/edu/cornell/cs/apl/nativetools/CollectLibraryTask.kt‎ renamed to ‎buildSrc/src/main/kotlin/io.github.apl_cornell/nativetools/CollectLibraryTask.kt‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
package edu.cornell.cs.apl.nativetools
2-
3-
import edu.cornell.cs.apl.nativetools.templates.LibraryConstants
4-
import edu.cornell.cs.apl.nativetools.templates.Platform
5-
import edu.cornell.cs.apl.nativetools.templates.buildMakefile
6-
import edu.cornell.cs.apl.nativetools.templates.cmakeLists
7-
import edu.cornell.cs.apl.nativetools.templates.dependenciesMakefile
8-
import edu.cornell.cs.apl.nativetools.templates.dockerignore
9-
import edu.cornell.cs.apl.nativetools.templates.getMakefile
10-
import edu.cornell.cs.apl.nativetools.templates.linuxDockerfile
11-
import edu.cornell.cs.apl.nativetools.templates.macosDockerfile
12-
import edu.cornell.cs.apl.nativetools.templates.swigDockerfile
13-
import edu.cornell.cs.apl.nativetools.templates.swigMakefile
1+
package io.github.apl_cornell.nativetools
2+
3+
import io.github.apl_cornell.nativetools.templates.LibraryConstants
4+
import io.github.apl_cornell.nativetools.templates.Platform
5+
import io.github.apl_cornell.nativetools.templates.buildMakefile
6+
import io.github.apl_cornell.nativetools.templates.cmakeLists
7+
import io.github.apl_cornell.nativetools.templates.dependenciesMakefile
8+
import io.github.apl_cornell.nativetools.templates.dockerignore
9+
import io.github.apl_cornell.nativetools.templates.getMakefile
10+
import io.github.apl_cornell.nativetools.templates.linuxDockerfile
11+
import io.github.apl_cornell.nativetools.templates.macosDockerfile
12+
import io.github.apl_cornell.nativetools.templates.swigDockerfile
13+
import io.github.apl_cornell.nativetools.templates.swigMakefile
1414
import org.gradle.api.DefaultTask
1515
import org.gradle.api.file.Directory
1616
import org.gradle.api.file.DirectoryProperty
@@ -119,7 +119,7 @@ abstract class CollectLibraryTask : DefaultTask() {
119119
return
120120
val file = this.get().file(resource).asFile
121121
project.mkdir(file.parentFile)
122-
file.writeBytes(resourceURL.readBytes())
122+
file.writeBytes(resourceURL!!.readBytes())
123123
}
124124

125125
/** Copies [file] into this directory and renames it to [name]. */

‎buildSrc/src/main/kotlin/edu/cornell/cs/apl/nativetools/DockerCopy.kt‎ renamed to ‎buildSrc/src/main/kotlin/io.github.apl_cornell/nativetools/DockerCopy.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package edu.cornell.cs.apl.nativetools
1+
package io.github.apl_cornell.nativetools
22

33
import org.apache.tools.ant.util.TeeOutputStream
44
import org.gradle.api.Project

‎buildSrc/src/main/kotlin/edu/cornell/cs/apl/nativetools/DockerCopyTask.kt‎ renamed to ‎buildSrc/src/main/kotlin/io.github.apl_cornell/nativetools/DockerCopyTask.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package edu.cornell.cs.apl.nativetools
1+
package io.github.apl_cornell.nativetools
22

33
import org.gradle.api.DefaultTask
44
import org.gradle.api.file.Directory

‎buildSrc/src/main/kotlin/edu/cornell/cs/apl/nativetools/DownloadJNITask.kt‎ renamed to ‎buildSrc/src/main/kotlin/io.github.apl_cornell/nativetools/DownloadJNITask.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
package edu.cornell.cs.apl.nativetools
1+
package io.github.apl_cornell.nativetools
22

33
import de.undercouch.gradle.tasks.download.DownloadAction
4-
import java.io.File
54
import org.gradle.api.DefaultTask
65
import org.gradle.api.file.Directory
76
import org.gradle.api.provider.Provider
87
import org.gradle.api.tasks.Input
98
import org.gradle.api.tasks.Internal
109
import org.gradle.api.tasks.OutputDirectory
1110
import org.gradle.api.tasks.TaskAction
11+
import java.io.File
1212

1313
abstract class DownloadJNITask : DefaultTask() {
1414
@get:Internal

‎buildSrc/src/main/kotlin/edu/cornell/cs/apl/nativetools/Library.kt‎ renamed to ‎buildSrc/src/main/kotlin/io.github.apl_cornell/nativetools/Library.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package edu.cornell.cs.apl.nativetools
1+
package io.github.apl_cornell.nativetools
22

33
import org.gradle.api.tasks.Input
44
import org.gradle.api.tasks.Internal

‎buildSrc/src/main/kotlin/edu/cornell/cs/apl/nativetools/SwigLibraryPlugin.kt‎ renamed to ‎buildSrc/src/main/kotlin/io.github.apl_cornell/nativetools/SwigLibraryPlugin.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
package edu.cornell.cs.apl.nativetools
1+
package io.github.apl_cornell.nativetools
22

3-
import edu.cornell.cs.apl.nativetools.templates.LibraryConstants
4-
import edu.cornell.cs.apl.nativetools.templates.Platform
5-
import java.io.File
3+
import io.github.apl_cornell.nativetools.templates.LibraryConstants
4+
import io.github.apl_cornell.nativetools.templates.Platform
65
import org.gradle.api.Plugin
76
import org.gradle.api.Project
87
import org.gradle.api.tasks.SourceSet
@@ -11,6 +10,7 @@ import org.gradle.api.tasks.TaskProvider
1110
import org.gradle.kotlin.dsl.create
1211
import org.gradle.kotlin.dsl.getByType
1312
import org.gradle.kotlin.dsl.register
13+
import java.io.File
1414

1515
class SwigLibraryPlugin : Plugin<Project> {
1616
override fun apply(project: Project) {

‎buildSrc/src/main/kotlin/edu/cornell/cs/apl/nativetools/SwigLibraryPluginExtension.kt‎ renamed to ‎buildSrc/src/main/kotlin/io.github.apl_cornell/nativetools/SwigLibraryPluginExtension.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package edu.cornell.cs.apl.nativetools
1+
package io.github.apl_cornell.nativetools
22

33
import org.gradle.api.provider.ListProperty
44

‎buildSrc/src/main/kotlin/edu/cornell/cs/apl/nativetools/Utility.kt‎ renamed to ‎buildSrc/src/main/kotlin/io.github.apl_cornell/nativetools/Utility.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package edu.cornell.cs.apl.nativetools
1+
package io.github.apl_cornell.nativetools
22

33
import org.gradle.api.file.Directory
44
import org.gradle.api.file.RegularFile

0 commit comments

Comments
 (0)