Skip to content

Commit

Permalink
Revert commit "Prepare for packaging internally" 44b6dd6
Browse files Browse the repository at this point in the history
  • Loading branch information
markst committed Jul 10, 2024
1 parent 82446b3 commit b542212
Show file tree
Hide file tree
Showing 32 changed files with 82 additions and 93 deletions.
15 changes: 9 additions & 6 deletions .github/workflows/publish-plugin.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
name: Publish Plugin to Portal
on: [ workflow_dispatch ]

on:
push:
tags:
- '*'

jobs:
gradle:
runs-on: ubuntu-latest
Expand All @@ -22,10 +27,8 @@ jobs:
key: cache-gradle-wrapper
- name: Run Gradle tasks
run: ./gradlew preMerge --continue
- name: Release library
run: ./gradlew publish
env:
GITHUB_USER: ${{ github.actor }}
GITHUB_TOKEN: ${{ github.token }}
- name: Publish on Plugin Portal
run: ./gradlew --project-dir plugin-build setupPluginUploadFromEnvironment publishPlugins
if: success()
- name: Stop Gradle
run: ./gradlew --stop
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Multiplatform.
plugins {
java
kotlin("multiplatform")
id("com.doublesymmetry.kotlin-native-spm")
id("com.github.pagr0m.kotlin-native-spm")
}
```

Expand Down
2 changes: 1 addition & 1 deletion example/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
java
kotlin("multiplatform")
id("com.doublesymmetry.kotlin-native-spm")
id("com.github.pagr0m.kotlin.native.spm")
}

kotlin {
Expand Down
10 changes: 5 additions & 5 deletions plugin-build/buildSrc/src/main/java/Coordinates.kt
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
object PluginCoordinates {
const val GROUP = "com.doublesymmetry"
const val ARTIFACT = "kotlin-native-spm"
const val GROUP = "com.github.pagr0m"
const val ARTIFACT = "kotlin.native.spm"
const val VERSION = "0.1.2"

const val ID = "$GROUP.$ARTIFACT"
const val IMPLEMENTATION_CLASS = "$GROUP.kotlin.native.spm.plugin.KotlinSpmPlugin"
const val IMPLEMENTATION_CLASS = "$ID.plugin.KotlinSpmPlugin"
}

object PluginBundle {
const val VCS = "https://github.com/doublesymmetry/kotlin-spm-plugin"
const val WEBSITE = "https://github.com/doublesymmetry/kotlin-spm-plugin"
const val VCS = "https://github.com/PaGr0m/kotlin-spm-plugin"
const val WEBSITE = "https://github.com/PaGr0m/kotlin-spm-plugin"
const val DESCRIPTION = "Gradle plugin for Swift Package Manager integration with Kotlin Multiplatform projects"
const val DISPLAY_NAME = "Gradle Plugin for SPM integration with Kotlin MPP"

Expand Down
12 changes: 0 additions & 12 deletions plugin-build/plugin/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -50,18 +50,6 @@ gradlePlugin {
vcsUrl = PluginBundle.VCS
}

publishing {
repositories {
maven {
setUrl("https://maven.pkg.github.com/doublesymmetry/kotlin-native-spm")
credentials {
username = System.getenv("GITHUB_USER")
password = System.getenv("GITHUB_TOKEN")
}
}
}
}

tasks.create("setupPluginUploadFromEnvironment") {
doLast {
val key = System.getenv("GRADLE_PUBLISH_KEY")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.doublesymmetry.kotlin.native.spm
package com.github.pagr0m.kotlin.native.spm

import org.gradle.api.Project
import org.jetbrains.kotlin.konan.target.Family
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.doublesymmetry.kotlin.native.spm.entity
package com.github.pagr0m.kotlin.native.spm.entity

@DslMarker
annotation class DependencyMarker
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.doublesymmetry.kotlin.native.spm.entity
package com.github.pagr0m.kotlin.native.spm.entity

import org.gradle.api.Named

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.doublesymmetry.kotlin.native.spm.entity.impl
package com.github.pagr0m.kotlin.native.spm.entity.impl

import com.doublesymmetry.kotlin.native.spm.entity.DependencyMarker
import com.github.pagr0m.kotlin.native.spm.entity.DependencyMarker
import org.gradle.api.Named
import org.gradle.api.tasks.Input
import org.gradle.api.tasks.Internal
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.doublesymmetry.kotlin.native.spm.entity.impl
package com.github.pagr0m.kotlin.native.spm.entity.impl

import com.doublesymmetry.kotlin.native.spm.entity.PlatformMarker
import com.doublesymmetry.kotlin.native.spm.entity.Product
import com.doublesymmetry.kotlin.native.spm.entity.Target
import com.github.pagr0m.kotlin.native.spm.entity.PlatformMarker
import com.github.pagr0m.kotlin.native.spm.entity.Product
import com.github.pagr0m.kotlin.native.spm.entity.Target
import groovy.lang.Closure
import org.gradle.api.NamedDomainObjectContainer
import org.gradle.api.Project
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.doublesymmetry.kotlin.native.spm.entity.impl
package com.github.pagr0m.kotlin.native.spm.entity.impl

import com.doublesymmetry.kotlin.native.spm.entity.Product
import com.doublesymmetry.kotlin.native.spm.entity.ProductMarker
import com.doublesymmetry.kotlin.native.spm.utils.StringUnaryPlusContainer
import com.github.pagr0m.kotlin.native.spm.entity.Product
import com.github.pagr0m.kotlin.native.spm.entity.ProductMarker
import com.github.pagr0m.kotlin.native.spm.utils.StringUnaryPlusContainer
import groovy.lang.Closure
import org.gradle.util.ConfigureUtil

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.doublesymmetry.kotlin.native.spm.entity.impl
package com.github.pagr0m.kotlin.native.spm.entity.impl

import com.doublesymmetry.kotlin.native.spm.entity.SupportedProductMarker
import com.github.pagr0m.kotlin.native.spm.entity.SupportedProductMarker
import org.gradle.api.Named
import org.gradle.api.tasks.Input
import org.gradle.api.tasks.Internal
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.doublesymmetry.kotlin.native.spm.entity.impl
package com.github.pagr0m.kotlin.native.spm.entity.impl

import com.doublesymmetry.kotlin.native.spm.entity.TargetDependency
import com.doublesymmetry.kotlin.native.spm.entity.TargetDependencyMarker
import com.github.pagr0m.kotlin.native.spm.entity.TargetDependency
import com.github.pagr0m.kotlin.native.spm.entity.TargetDependencyMarker

@TargetDependencyMarker
class TargetDependencyManager {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.doublesymmetry.kotlin.native.spm.entity.impl
package com.github.pagr0m.kotlin.native.spm.entity.impl

import com.doublesymmetry.kotlin.native.spm.entity.Target
import com.doublesymmetry.kotlin.native.spm.entity.TargetDependency
import com.doublesymmetry.kotlin.native.spm.entity.TargetMarker
import com.doublesymmetry.kotlin.native.spm.utils.StringUnaryPlusContainer
import com.github.pagr0m.kotlin.native.spm.entity.Target
import com.github.pagr0m.kotlin.native.spm.entity.TargetDependency
import com.github.pagr0m.kotlin.native.spm.entity.TargetMarker
import com.github.pagr0m.kotlin.native.spm.utils.StringUnaryPlusContainer
import groovy.lang.Closure
import org.gradle.api.tasks.Input
import org.gradle.api.tasks.Nested
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.doublesymmetry.kotlin.native.spm.plugin
package com.github.pagr0m.kotlin.native.spm.plugin

import com.doublesymmetry.kotlin.native.spm.entity.impl.PlatformManager
import com.github.pagr0m.kotlin.native.spm.entity.impl.PlatformManager
import groovy.lang.Closure
import org.gradle.api.Project
import org.gradle.api.tasks.Nested
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.doublesymmetry.kotlin.native.spm.plugin
package com.github.pagr0m.kotlin.native.spm.plugin

import com.doublesymmetry.kotlin.native.spm.entity.impl.PlatformManager
import com.doublesymmetry.kotlin.native.spm.swiftPackageBuildDirs
import com.doublesymmetry.kotlin.native.spm.tasks.*
import com.github.pagr0m.kotlin.native.spm.entity.impl.PlatformManager
import com.github.pagr0m.kotlin.native.spm.swiftPackageBuildDirs
import com.github.pagr0m.kotlin.native.spm.tasks.*
import org.gradle.api.NamedDomainObjectContainer
import org.gradle.api.Plugin
import org.gradle.api.Project
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.doublesymmetry.kotlin.native.spm.tasks
package com.github.pagr0m.kotlin.native.spm.tasks

import com.doublesymmetry.kotlin.native.spm.plugin.KotlinSpmPlugin
import com.doublesymmetry.kotlin.native.spm.swiftPackageBuildDirs
import com.github.pagr0m.kotlin.native.spm.plugin.KotlinSpmPlugin
import com.github.pagr0m.kotlin.native.spm.swiftPackageBuildDirs
import org.gradle.api.provider.Property
import org.gradle.api.tasks.CacheableTask
import org.gradle.api.tasks.InputDirectory
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
package com.doublesymmetry.kotlin.native.spm.tasks
package com.github.pagr0m.kotlin.native.spm.tasks

import com.github.pagr0m.kotlin.native.spm.plugin.KotlinSpmPlugin
import com.github.pagr0m.kotlin.native.spm.swiftPackageBuildDirs

import com.doublesymmetry.kotlin.native.spm.entity.impl.DependencyManager.Package
import com.doublesymmetry.kotlin.native.spm.plugin.KotlinSpmPlugin
import com.doublesymmetry.kotlin.native.spm.swiftPackageBuildDirs
import groovy.transform.EqualsAndHashCode
import org.apache.tools.ant.taskdefs.Pack
import org.gradle.api.DefaultTask
import org.gradle.api.provider.ListProperty
import org.gradle.api.provider.Property
Expand All @@ -14,7 +12,6 @@ import org.jetbrains.kotlin.konan.target.Family
import java.io.File
import java.nio.file.Files
import java.nio.file.Path
import java.nio.file.StandardCopyOption

@CacheableTask
abstract class BuildFrameworksTask : DefaultTask() {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.doublesymmetry.kotlin.native.spm.tasks
package com.github.pagr0m.kotlin.native.spm.tasks

import com.doublesymmetry.kotlin.native.spm.plugin.KotlinSpmPlugin
import com.doublesymmetry.kotlin.native.spm.swiftPackageBuildDirs
import com.github.pagr0m.kotlin.native.spm.plugin.KotlinSpmPlugin
import com.github.pagr0m.kotlin.native.spm.swiftPackageBuildDirs
import org.gradle.api.tasks.*
import java.io.File
import java.nio.file.Files
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
package com.doublesymmetry.kotlin.native.spm.tasks
package com.github.pagr0m.kotlin.native.spm.tasks

import com.doublesymmetry.kotlin.native.spm.plugin.KotlinSpmPlugin
import com.doublesymmetry.kotlin.native.spm.swiftPackageBuildDirs
import com.github.pagr0m.kotlin.native.spm.plugin.KotlinSpmPlugin
import com.github.pagr0m.kotlin.native.spm.swiftPackageBuildDirs
import org.gradle.api.DefaultTask
import org.gradle.api.provider.Property
import org.gradle.api.tasks.Input
import org.gradle.api.tasks.Nested
import org.gradle.api.tasks.TaskAction
import org.jetbrains.kotlin.konan.target.Family

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.doublesymmetry.kotlin.native.spm.tasks
package com.github.pagr0m.kotlin.native.spm.tasks

import com.doublesymmetry.kotlin.native.spm.entity.impl.DependencyManager
import com.doublesymmetry.kotlin.native.spm.plugin.KotlinSpmPlugin
import com.doublesymmetry.kotlin.native.spm.swiftPackageBuildDirs
import com.github.pagr0m.kotlin.native.spm.entity.impl.DependencyManager
import com.github.pagr0m.kotlin.native.spm.plugin.KotlinSpmPlugin
import com.github.pagr0m.kotlin.native.spm.swiftPackageBuildDirs
import org.gradle.api.DefaultTask
import org.gradle.api.NamedDomainObjectContainer
import org.gradle.api.provider.Property
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.doublesymmetry.kotlin.native.spm.tasks
package com.github.pagr0m.kotlin.native.spm.tasks

import com.doublesymmetry.kotlin.native.spm.plugin.KotlinSpmPlugin
import com.doublesymmetry.kotlin.native.spm.swiftPackageBuildDirs
import com.github.pagr0m.kotlin.native.spm.plugin.KotlinSpmPlugin
import com.github.pagr0m.kotlin.native.spm.swiftPackageBuildDirs
import org.gradle.api.DefaultTask
import org.gradle.api.provider.Property
import org.gradle.api.provider.Provider
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.doublesymmetry.kotlin.native.spm.tasks
package com.github.pagr0m.kotlin.native.spm.tasks

import com.doublesymmetry.kotlin.native.spm.plugin.KotlinSpmPlugin
import com.doublesymmetry.kotlin.native.spm.swiftPackageBuildDirs
import com.github.pagr0m.kotlin.native.spm.plugin.KotlinSpmPlugin
import com.github.pagr0m.kotlin.native.spm.swiftPackageBuildDirs
import org.gradle.api.provider.Property
import org.gradle.api.provider.Provider
import org.gradle.api.tasks.*
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.doublesymmetry.kotlin.native.spm.tasks
package com.github.pagr0m.kotlin.native.spm.tasks

import com.doublesymmetry.kotlin.native.spm.plugin.KotlinSpmPlugin
import com.doublesymmetry.kotlin.native.spm.swiftPackageBuildDirs
import com.github.pagr0m.kotlin.native.spm.plugin.KotlinSpmPlugin
import com.github.pagr0m.kotlin.native.spm.swiftPackageBuildDirs
import groovy.text.SimpleTemplateEngine
import org.eclipse.jgit.api.Git
import org.eclipse.jgit.transport.CredentialsProvider
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.doublesymmetry.kotlin.native.spm.tasks
package com.github.pagr0m.kotlin.native.spm.tasks

import com.doublesymmetry.kotlin.native.spm.plugin.KotlinSpmPlugin
import com.github.pagr0m.kotlin.native.spm.plugin.KotlinSpmPlugin
import org.gradle.api.DefaultTask

abstract class SpmImport : DefaultTask() {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.doublesymmetry.kotlin.native.spm.utils
package com.github.pagr0m.kotlin.native.spm.utils

@Suppress("UnnecessaryAbstractClass")
abstract class StringUnaryPlusContainer {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.doublesymmetry.kotlin.native.spm.plugin
package com.github.pagr0m.kotlin.native.spm.plugin

import org.gradle.testkit.runner.BuildTask
import org.gradle.testkit.runner.GradleRunner
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.doublesymmetry.kotlin.native.spm.plugin
package com.github.pagr0m.kotlin.native.spm.plugin

import com.doublesymmetry.kotlin.native.spm.SwiftPackageBuildDirs
import com.github.pagr0m.kotlin.native.spm.SwiftPackageBuildDirs
import org.gradle.testkit.runner.GradleRunner
import org.gradle.testkit.runner.TaskOutcome
import org.jetbrains.kotlin.konan.target.Family
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.doublesymmetry.kotlin.native.spm.plugin
package com.github.pagr0m.kotlin.native.spm.plugin

import org.gradle.testkit.runner.BuildTask
import org.gradle.testkit.runner.TaskOutcome
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
java
kotlin("multiplatform")
id("com.doublesymmetry.kotlin-native-spm")
id("com.github.pagr0m.kotlin-native-spm")
}

kotlin {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
java
kotlin("multiplatform")
id("com.doublesymmetry.kotlin-native-spm")
id("com.github.pagr0m.kotlin-native-spm")
}

kotlin {
Expand Down
2 changes: 1 addition & 1 deletion plugin-build/settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ pluginManagement {
}
}

rootProject.name = ("kotlin-native-spm")
rootProject.name = ("com.github.pagr0m.kotlin.native.spm")

include(":plugin")

0 comments on commit b542212

Please sign in to comment.