Skip to content

Commit f68f21e

Browse files
TropheusJTropheusJ
committed
publishing updates
1 parent 8ffaff4 commit f68f21e

File tree

74 files changed

+281
-269
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+281
-269
lines changed

‎.github/workflows/build.yml‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ on:
55
workflow_dispatch:
66
inputs:
77
publish:
8-
description: Publish to Maven
8+
description: Publish Mode (release, snapshot, none)
99
required: true
10-
default: "false"
10+
default: "none"
1111

1212
jobs:
1313
build:
@@ -40,6 +40,10 @@ jobs:
4040
name: Artifacts
4141
path: build/libs/
4242

43-
- name: Publish
44-
if: ${{ github.event.inputs.publish }}
45-
run: ./gradlew :plugin:publish -PdevOSUsername=cichlidmc -PdevOSPassword="${{ secrets.DEVOS_PASS }}"
43+
- name: Publish Release
44+
if: ${{ github.event.inputs.publish == 'release' }}
45+
run: ./gradlew publishAllPublicationsToDevOsReleasesRepository -PdevOsReleasesUsername=cichlidmc -PdevOsReleasesPassword="${{ secrets.DEVOS_PASS }}"
46+
47+
- name: Publish Snapshot
48+
if: ${{ github.event.inputs.publish == 'snapshot' }}
49+
run: ./gradlew publishAllPublicationsToDevOsSnapshotsRepository -PdevOsSnapshotsUsername=cichlidmc -PdevOsSnapshotsPassword="${{ secrets.DEVOS_PASS }}"

‎build.gradle.kts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
plugins {
22
id("java")
3-
id("io.github.cichlidmc.cichlid_gradle")
3+
id("fish.cichlidmc.cichlid-gradle")
44
id("maven-publish")
55
}
66

7-
group = "io.github.cichlidmc"
7+
group = "fish.cichlidmc"
88
version = "1.0-SNAPSHOT"
99

1010
repositories {
1111
mavenCentral()
12-
cichlid.snapshots()
12+
cichlid.releases()
1313
minecraft.libraries()
1414
minecraft.versions()
1515
}

‎plugin/build.gradle.kts‎

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,55 @@
11
plugins {
2-
id("com.gradle.plugin-publish") version "1.2.1"
2+
id("java-gradle-plugin")
3+
id("maven-publish")
34
id("com.gradleup.shadow") version "8.3.0"
45
id("com.github.johnrengelman.shadow") version "dummy"
56
}
67

7-
base.archivesName = "CichlidGradle"
8-
group = "io.github.cichlidmc"
8+
group = "fish.cichlidmc"
99
version = "1.0-SNAPSHOT"
1010

1111
repositories {
1212
mavenCentral()
13-
maven("https://mvn.devos.one/snapshots")
13+
maven("https://mvn.devos.one/releases")
1414
maven("https://maven.neoforged.net")
1515
}
1616

1717
dependencies {
18-
implementation("io.github.cichlidmc:DistributionMarker:1.0.1")
19-
implementation("io.github.cichlidmc:PistonMetaParser:2.0.2")
20-
implementation("io.github.cichlidmc:sushi:0.1.0")
18+
implementation("fish.cichlidmc:distribution-marker:1.0.1")
19+
implementation("fish.cichlidmc:piston-meta-parser:2.0.2")
20+
implementation("fish.cichlidmc:sushi:0.1.0")
2121
implementation("net.neoforged:AutoRenamingTool:2.0.3")
2222
implementation("org.ow2.asm:asm-tree:9.7")
2323
implementation("org.vineflower:vineflower:1.11.1")
2424
}
2525

2626
tasks.named("shadowJar", com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar::class) {
2727
archiveClassifier = ""
28-
relocate("net.neoforged", "io.github.cichlidmc.shadow.net.neoforged")
28+
relocate("net.neoforged", "fish.cichlidmc.shadow.net.neoforged")
2929
}
3030

3131
gradlePlugin {
32-
website = "https://cichlidmc.github.io/"
33-
vcsUrl = "https://github.com/CichlidMC/CichlidGradle"
32+
website = "https://cichlidmc.fish/"
33+
vcsUrl = "https://github.com/CichlidMC/cichlid-gradle"
3434

3535
plugins {
3636
create("cichlidGradle") {
37-
id = "$group.cichlid_gradle"
37+
id = "$group.cichlid-gradle"
3838
displayName = "Cichlid Gradle"
3939
description = "Gradle plugin for developing Minecraft mods with Cichlid"
4040
tags = setOf("java", "minecraft", "mod", "modding", "cichlid", "cichlidmc", "mcdev", "minecraft-dev", "minecraft-modding")
41-
implementationClass = "io.github.cichlidmc.cichlid_gradle.CichlidGradlePlugin"
41+
implementationClass = "fish.cichlidmc.cichlid_gradle.CichlidGradlePlugin"
4242
}
4343
}
4444
}
4545

4646
publishing {
4747
repositories {
48-
maven("https://mvn.devos.one/snapshots") {
49-
name = "devOS"
50-
credentials(PasswordCredentials::class)
48+
listOf("Releases", "Snapshots").forEach {
49+
maven("https://mvn.devos.one/${it.lowercase()}") {
50+
name = "devOs$it"
51+
credentials(PasswordCredentials::class)
52+
}
5153
}
5254
}
5355
}

‎plugin/settings.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
rootProject.name = "CichlidGradle"
1+
rootProject.name = "cichlid-gradle"
22
enableFeaturePreview("STABLE_CONFIGURATION_CACHE")
33

44
pluginManagement {

‎plugin/shadow-dummy/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ gradlePlugin {
1212
plugins {
1313
create("shadow") {
1414
id = "com.github.johnrengelman.shadow"
15-
implementationClass = "io.github.cichlidmc.shadow_dummy.DummyPlugin"
15+
implementationClass = "fish.cichlidmc.shadow_dummy.DummyPlugin"
1616
}
1717
}
1818
}

‎plugin/shadow-dummy/src/main/java/io/github/cichlidmc/shadow_dummy/DummyPlugin.java‎ renamed to ‎plugin/shadow-dummy/src/main/java/fish/cichlidmc/shadow_dummy/DummyPlugin.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.github.cichlidmc.shadow_dummy;
1+
package fish.cichlidmc.shadow_dummy;
22

33
import org.gradle.api.Plugin;
44
import org.gradle.api.Project;

‎plugin/src/main/java/io/github/cichlidmc/cichlid_gradle/CichlidGradlePlugin.java‎ renamed to ‎plugin/src/main/java/fish/cichlidmc/cichlid_gradle/CichlidGradlePlugin.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
package io.github.cichlidmc.cichlid_gradle;
2-
3-
import io.github.cichlidmc.cichlid_gradle.cache.CichlidCache;
4-
import io.github.cichlidmc.cichlid_gradle.cache.mcmaven.McMavenConnectorFactory;
5-
import io.github.cichlidmc.cichlid_gradle.extension.CichlidExtension;
6-
import io.github.cichlidmc.cichlid_gradle.extension.dep.CichlidDepsExtension;
7-
import io.github.cichlidmc.cichlid_gradle.extension.dep.MinecraftDepsExtension;
8-
import io.github.cichlidmc.cichlid_gradle.extension.repo.CichlidReposExtension;
9-
import io.github.cichlidmc.cichlid_gradle.extension.repo.MinecraftReposExtension;
10-
import io.github.cichlidmc.cichlid_gradle.run.RunTaskGeneration;
1+
package fish.cichlidmc.cichlid_gradle;
2+
3+
import fish.cichlidmc.cichlid_gradle.cache.CichlidCache;
4+
import fish.cichlidmc.cichlid_gradle.cache.mcmaven.McMavenConnectorFactory;
5+
import fish.cichlidmc.cichlid_gradle.extension.CichlidExtension;
6+
import fish.cichlidmc.cichlid_gradle.extension.dep.CichlidDepsExtension;
7+
import fish.cichlidmc.cichlid_gradle.extension.dep.MinecraftDepsExtension;
8+
import fish.cichlidmc.cichlid_gradle.extension.repo.CichlidReposExtension;
9+
import fish.cichlidmc.cichlid_gradle.extension.repo.MinecraftReposExtension;
10+
import fish.cichlidmc.cichlid_gradle.run.RunTaskGeneration;
1111
import org.gradle.api.NamedDomainObjectProvider;
1212
import org.gradle.api.Plugin;
1313
import org.gradle.api.Project;

‎plugin/src/main/java/io/github/cichlidmc/cichlid_gradle/cache/CichlidCache.java‎ renamed to ‎plugin/src/main/java/fish/cichlidmc/cichlid_gradle/cache/CichlidCache.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
package io.github.cichlidmc.cichlid_gradle.cache;
1+
package fish.cichlidmc.cichlid_gradle.cache;
22

3-
import io.github.cichlidmc.cichlid_gradle.cache.storage.AssetStorage;
4-
import io.github.cichlidmc.cichlid_gradle.cache.storage.VersionStorage;
5-
import io.github.cichlidmc.cichlid_gradle.cache.task.TaskContext;
6-
import io.github.cichlidmc.pistonmetaparser.FullVersion;
7-
import io.github.cichlidmc.pistonmetaparser.manifest.Version;
3+
import fish.cichlidmc.cichlid_gradle.cache.storage.AssetStorage;
4+
import fish.cichlidmc.cichlid_gradle.cache.storage.VersionStorage;
5+
import fish.cichlidmc.cichlid_gradle.cache.task.TaskContext;
6+
import fish.cichlidmc.pistonmetaparser.FullVersion;
7+
import fish.cichlidmc.pistonmetaparser.manifest.Version;
88
import org.gradle.api.Project;
99

1010
import java.nio.file.Path;

‎plugin/src/main/java/io/github/cichlidmc/cichlid_gradle/cache/ManifestCache.java‎ renamed to ‎plugin/src/main/java/fish/cichlidmc/cichlid_gradle/cache/ManifestCache.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
package io.github.cichlidmc.cichlid_gradle.cache;
1+
package fish.cichlidmc.cichlid_gradle.cache;
22

3-
import io.github.cichlidmc.pistonmetaparser.FullVersion;
4-
import io.github.cichlidmc.pistonmetaparser.PistonMeta;
5-
import io.github.cichlidmc.pistonmetaparser.VersionManifest;
6-
import io.github.cichlidmc.pistonmetaparser.manifest.Version;
3+
import fish.cichlidmc.pistonmetaparser.FullVersion;
4+
import fish.cichlidmc.pistonmetaparser.PistonMeta;
5+
import fish.cichlidmc.pistonmetaparser.VersionManifest;
6+
import fish.cichlidmc.pistonmetaparser.manifest.Version;
77

88
/**
99
* Wraps access to a cached manifest singleton in synchronization so it's safe to share

‎plugin/src/main/java/io/github/cichlidmc/cichlid_gradle/cache/mcmaven/McMavenConnectorFactory.java‎ renamed to ‎plugin/src/main/java/fish/cichlidmc/cichlid_gradle/cache/mcmaven/McMavenConnectorFactory.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package io.github.cichlidmc.cichlid_gradle.cache.mcmaven;
1+
package fish.cichlidmc.cichlid_gradle.cache.mcmaven;
22

3-
import io.github.cichlidmc.cichlid_gradle.cache.CichlidCache;
3+
import fish.cichlidmc.cichlid_gradle.cache.CichlidCache;
44
import org.gradle.api.internal.artifacts.repositories.transport.RepositoryTransportFactory;
55
import org.gradle.authentication.Authentication;
66
import org.gradle.internal.resource.connector.ResourceConnectorFactory;
@@ -9,7 +9,6 @@
99
import org.gradle.internal.resource.transfer.ExternalResourceConnector;
1010

1111
import java.lang.reflect.Field;
12-
import java.nio.file.Path;
1312
import java.util.List;
1413
import java.util.Set;
1514

0 commit comments

Comments
 (0)