Skip to content

Commit

Permalink
Final cleanup before next release
Browse files Browse the repository at this point in the history
* removed some remaining occurences of GitHub
* removed no longer used imports
* cleared up the README section about opening issues
  • Loading branch information
floscher committed Jun 6, 2018
1 parent 2993035 commit 949779f
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 20 deletions.
11 changes: 5 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
# Gradle plugin for developing JOSM plugins

[![build status](https://gitlab.com/floscher/gradle-josm-plugin/badges/master/build.svg)](https://gitlab.com/floscher/gradle-josm-plugin/pipelines?scope=branches)
[![latest release](https://img.shields.io/github/tag/floscher/gradle-josm-plugin.svg?style=flat-square)](https://plugins.gradle.org/plugin/org.openstreetmap.josm)
[![license](https://img.shields.io/github/license/floscher/gradle-josm-plugin.svg?style=flat-square)](https://github.com/floscher/gradle-josm-plugin/blob/master/LICENSE)
[![License is GPLv3](https://img.shields.io/badge/license-GPLv3-blue.svg)](https://gitlab.com/floscher/gradle-josm-plugin/blob/master/LICENSE)

This Gradle plugin is designed to make development of JOSM plugins easier.

Expand All @@ -11,8 +10,8 @@ Things like test driving your JOSM plugins before releasing them becomes as easy
See the docs below for many more things you can do. And you don't even need to abandon the Ant build, which is used for most of the JOSM plugins. Option 2 in [the guide for setting up the `gradle-josm-plugin`](docs/Setup.md) explains how a JOSM plugin can support building with either build system (many configuration options can be shared between both).

If you miss something here, found something that's broken, or need more info about this project:
Feel free to open issues on this project!
Or you can reach out via email: incoming+floscher/gradle-[email protected] (e-mails to this address will end up published online)
* Feel free to [open issues on this project](https://gitlab.com/floscher/gradle-josm-plugin/issues/new)!
* Or you can reach out via email: [incoming+floscher/gradle-[email protected]](mailto:incoming+floscher/[email protected]) (e-mails to this address will be published online as issues)

## Getting started

Expand All @@ -33,12 +32,12 @@ Also, the [KDoc (similar to Javadoc, but for Kotlin)](https://floscher.gitlab.io
* [fieldpapers/josm-**fieldpapers**](https://github.com/fieldpapers/josm-fieldpapers)
* [JOSM/**geojson**](https://github.com/JOSM/geojson)
* [osmlab/**josm-atlas**](https://github.com/osmlab/josm-atlas)
* [qeef/**mapathoner**](https://github.com/qeef/mapathoner)
* [qeef/**mapathoner**](https://gitlab.com/qeef/mapathoner)
* [JOSM/**Mapillary**](https://github.com/JOSM/Mapillary)
* [matsim-org/josm-**matsim**-plugin](https://github.com/matsim-org/josm-matsim-plugin)
* [iandees/josm-**mbtiles**](https://github.com/iandees/josm-mbtiles)
* [Gubaer/josm-**scripting**-plugin](https://github.com/Gubaer/josm-scripting-plugin)
* [JOSM/**wikipedia**](https://github.com/JOSM/wikipedia)
* [JOSM/**wikipedia**](https://gitlab.com/floscher/JOSM-wikipedia)

## Deprecated links
Alternatively to the default Gradle plugin repository, you can download this plugin from a Maven repository at `https://floscher.gitlab.io/gradle-josm-plugin/maven`.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
import org.openstreetmap.josm.gradle.plugin.config.JosmPluginExtension;
import org.openstreetmap.josm.gradle.plugin.setup.PluginTaskSetup;
import org.openstreetmap.josm.gradle.plugin.task.TaskSetupKt;
import org.openstreetmap.josm.gradle.plugin.GitDescriber;

/**
* Main class of the plugin, sets up the custom configurations <code>requiredPlugin</code> and <code>packIntoJar</code>,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,33 +1,23 @@
package org.openstreetmap.josm.gradle.plugin.setup;

import java.io.BufferedReader;
import java.io.BufferedWriter;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.OutputStreamWriter;
import java.net.MalformedURLException;
import java.net.URLConnection;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.util.Base64;
import java.util.Optional;
import java.util.stream.Collectors;
import org.gradle.api.Project;
import org.gradle.api.Task;
import org.gradle.api.artifacts.Dependency;
import org.gradle.api.plugins.BasePluginConvention;
import org.gradle.api.tasks.Sync;
import org.gradle.api.tasks.TaskExecutionException;
import org.gradle.api.tasks.TaskInstantiationException;
import org.gradle.api.tasks.bundling.Jar;
import org.openstreetmap.josm.gradle.plugin.ProjectKt;
import org.openstreetmap.josm.gradle.plugin.config.JosmPluginExtension;
import org.openstreetmap.josm.gradle.plugin.task.WriteRequiredPluginConfig;
import org.openstreetmap.josm.gradle.plugin.task.GeneratePluginList;
import org.openstreetmap.josm.gradle.plugin.task.LangCompile;

Expand Down
5 changes: 2 additions & 3 deletions src/main/kotlin/config/I18nConfig.kt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package org.openstreetmap.josm.gradle.plugin.config
import groovy.lang.Closure
import org.gradle.api.Project
import org.openstreetmap.josm.gradle.plugin.GitDescriber
import java.io.File
import java.util.regex.Pattern

/**
Expand Down Expand Up @@ -54,7 +53,7 @@ class I18nConfig(private val project: Project) {
* `#: `).
*
* **Default value:** `{a -> a}` (identity)
* @see getGithubPathTransformer
* @see getPathTransformer
*/
var pathTransformer: (String) -> String = {a -> a};

Expand All @@ -70,7 +69,7 @@ class I18nConfig(private val project: Project) {
* Supply a repo slug (`username/repo`) and this method will return a function,
* which you can use as value for the field [pathTransformer].
*/
@Deprecated("Use the more generic getPathTransformer() instead", ReplaceWith("getPathTransformer(\"github.com/\" + repoSlug + \"/blob\")"))
@Deprecated("Use the more generic getPathTransformer() instead", ReplaceWith("getPathTransformer(\"github.com/\$repoSlug/blob\")"))
fun getGithubPathTransformer(repoSlug: String) = getPathTransformer("github.com/$repoSlug/blob")

/**
Expand Down

0 comments on commit 949779f

Please sign in to comment.