From 961f745be9dc2aa8aa421f81a502b8c6c4ef612f Mon Sep 17 00:00:00 2001 From: cohelet Date: Thu, 4 May 2017 01:37:07 +0200 Subject: [PATCH] migrate to organisation --- appveyor.yml | 14 +++++++------- build.gradle | 4 ++-- doc/rst/install.rst | 12 ++++++------ scripts/upload_deb.sh | 4 ++-- scripts/upload_dmg.sh | 2 +- scripts/upload_jar.sh | 4 ++-- scripts/upload_rpm.sh | 6 +++--- 7 files changed, 23 insertions(+), 23 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 669ab5694..80d430d09 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -4,9 +4,9 @@ environment: TERM: dumb matrix: - JAVA_HOME: C:\Program Files (x86)\Java\jdk1.8.0 - PLATFORM: windows-x86 + PLATFORM: win32 - JAVA_HOME: C:\Program Files\Java\jdk1.8.0 - PLATFORM: windows-x64 + PLATFORM: win64 install: - set PATH=%JAVA_HOME%\bin;%PATH% - echo %PATH% @@ -31,13 +31,13 @@ deploy: - provider: BinTray on: appveyor_repo_tag: true - username: firm1 + username: firm2 version: $(APPVEYOR_REPO_TAG_NAME) api_key: - secure: uM4le5ByQ6WNAILGPWMhO0iAl4VH9iaHXfcBdHktVpXmrV9t7IT/oJYco9oYJsgJ - subject: firm1 + secure: vAEXLy1B2dK6n9JB/VQFG9M7jEV6T4wpjqG7PVcRRUafWQ1dQ0YKGKLg/p07sU5y + subject: zest-writer repo: $(PLATFORM) - package: setup + package: zest-writer publish: true - override: true + override: false explode: false diff --git a/build.gradle b/build.gradle index 948ea61dd..cdb9cfc7d 100644 --- a/build.gradle +++ b/build.gradle @@ -64,7 +64,7 @@ repositories { mavenCentral() jcenter() maven { - url "https://dl.bintray.com/firm1/maven" + url "https://dl.bintray.com/zest-writer/maven" } } @@ -131,7 +131,7 @@ dependencies { compile group: 'org.zeroturnaround', name: 'zt-zip', version: '1.10' compile group: 'org.controlsfx', name: 'controlsfx', version: '8.40.12' compile group: 'org.fxmisc.richtext', name: 'richtextfx', version: '0.7-M5' - compile group: 'com.zestedesavoir.zmarkdown', name: 'java-zmarkdown', version: '2.6.0.17' + compile group: 'eu.firm1.zmarkdown', name: 'java-zmarkdown', version: '2.6.0.17' compile group: 'com.fasterxml', name: 'jackson-module-json-org', version: '0.9.1' compile group: 'commons-io', name: 'commons-io', version: '2.5' compile group: 'org.projectlombok', name: 'lombok', version: '1.16.16' diff --git a/doc/rst/install.rst b/doc/rst/install.rst index 76e3b694c..7757ed0f0 100644 --- a/doc/rst/install.rst +++ b/doc/rst/install.rst @@ -15,8 +15,8 @@ Windows 32 bits Windows 64 bits `setup 32 bits`_ `setup 64 bits`_ ===================== ====================== -.. _setup 32 bits: https://bintray.com/firm1/windows-x86/setup/_latestVersion#files -.. _setup 64 bits: https://bintray.com/firm1/windows-x64/setup/_latestVersion#files +.. _setup 32 bits: https://bintray.com/zest-writer/windows-x86/setup/_latestVersion#files +.. _setup 64 bits: https://bintray.com/zest-writer/windows-x64/setup/_latestVersion#files .. NOTE:: Pour vérifier si votre ordinateur tourne sur une version 32 bits ou 64 bits de Windows, cliquez le bouton ``Windows``, ``Ordinateur``, puis ``Propriétés`` et regardez en dessous de ``Système``. @@ -24,7 +24,7 @@ Windows 32 bits Windows 64 bits Os X #### -Téléchargez la dernière version de Zest Writer via `ce lien `_, puis installez le fichier dmg. +Téléchargez la dernière version de Zest Writer via `ce lien `_, puis installez le fichier dmg. Linux ##### @@ -41,7 +41,7 @@ Debian, Ubuntu, etc. 2. ajoutez une nouvelle source : - ``echo "deb https://dl.bintray.com/firm1/deb wheezy main" | sudo tee -a /etc/apt/sources.list.d/zestwriter.list`` + ``echo "deb https://dl.bintray.com/zest-writer/deb wheezy main" | sudo tee -a /etc/apt/sources.list.d/zestwriter.list`` 3. mettez à jour vos dépôts : @@ -61,7 +61,7 @@ Fedora, ArchLinux, CentOs, etc. [zestwriter] name=zestwriter - baseurl=http://dl.bintray.com/firm1/rpm + baseurl=http://dl.bintray.com/zest-writer/rpm gpgcheck=0 enabled=1 @@ -75,7 +75,7 @@ Les fichiers ``jar`` sont plus légers car ils n'embarquent pas la machine virtu 1. Vérifier votre version de Java - ouvrez un terminal (``Windows + R`` puis ``cmd`` sous Windows) et tapez ``java -version`` ; - si vous avez Java 1.7 ou antérieure, téléchargez la dernière version de Java depuis `le site officiel `_ ; -2. téléchargez la dernière version de Zest Writer via `ce lien `_ ; +2. téléchargez la dernière version de Zest Writer via `ce lien `_ ; 3. ouvrez un terminal et lancez le jar en tapant ``java -jar zest-writer-all-x.y.z.jar`` (x.y.z étant le numéro de version). .. _install_from_sources: diff --git a/scripts/upload_deb.sh b/scripts/upload_deb.sh index 03a95dbb9..3bcd82213 100755 --- a/scripts/upload_deb.sh +++ b/scripts/upload_deb.sh @@ -12,8 +12,8 @@ VERSION=`cat gradle.properties | grep "version" | cut -d "=" -f2` echo "Upload du fichier $DEBFILE ..." -curl -T "$DEBFILE" -u "firm1:$APIKEY" "https://api.bintray.com/content/firm1/deb/zest-writer/$VERSION/$DEBFILE;deb_distribution=wheezy;deb_component=main;deb_architecture=i386,amd64" +curl -T "$DEBFILE" -u "firm1:$APIKEY" "https://api.bintray.com/content/zest-writer/deb/zest-writer/$VERSION/$DEBFILE;deb_distribution=wheezy,jessie;deb_component=main;deb_architecture=i386,amd64;publish=1;override=0" echo "Sign" -curl -u "firm1:$APIKEY" -X POST "https://api.bintray.com/calc_metadata/firm1/deb" +curl -u "firm1:$APIKEY" -X POST "https://api.bintray.com/calc_metadata/zest-writer/deb" \ No newline at end of file diff --git a/scripts/upload_dmg.sh b/scripts/upload_dmg.sh index 77ed6640d..ae67a123e 100755 --- a/scripts/upload_dmg.sh +++ b/scripts/upload_dmg.sh @@ -12,4 +12,4 @@ VERSION=`cat gradle.properties | grep "version" | cut -d "=" -f2` echo "Upload du fichier $DMGFILE ..." -curl -T "$DMGFILE" -u "firm1:$APIKEY" "https://api.bintray.com/content/firm1/dmg/zest-writer/$VERSION/$DMGFILE" +curl -T "$DMGFILE" -u "firm1:$APIKEY" "https://api.bintray.com/content/zest-writer/dmg/zest-writer/$VERSION/$DMGFILE?publish=1;override=0" diff --git a/scripts/upload_jar.sh b/scripts/upload_jar.sh index 71ebc296c..fa5a7a589 100755 --- a/scripts/upload_jar.sh +++ b/scripts/upload_jar.sh @@ -12,8 +12,8 @@ VERSION=`cat gradle.properties | grep "version" | cut -d "=" -f2` echo "Upload du fichier $DEBFILE ..." -curl -T "$DEBFILE" -u "firm1:$APIKEY" "https://api.bintray.com/content/firm1/maven/zest-writer/$VERSION/$DEBFILE" +curl -T "$DEBFILE" -u "firm1:$APIKEY" "https://api.bintray.com/content/zest-writer/maven/zest-writer/$VERSION/$DEBFILE?publish=1;override=0" echo "Sign" -curl -u "firm1:$APIKEY" -X POST "https://api.bintray.com/calc_metadata/firm1/maven/build/libs" +curl -u "firm1:$APIKEY" -X POST "https://api.bintray.com/calc_metadata/zest-writer/maven/build/libs" \ No newline at end of file diff --git a/scripts/upload_rpm.sh b/scripts/upload_rpm.sh index ca25bb99b..f6cb3a00c 100755 --- a/scripts/upload_rpm.sh +++ b/scripts/upload_rpm.sh @@ -10,10 +10,10 @@ RPMFILE=`ls build/distributions/*.rpm` APIKEY=$1 VERSION=`cat gradle.properties | grep "version" | cut -d "=" -f2` -echo "Upload du fichier $DEBFILE ..." +echo "Upload du fichier $RPMFILE ..." -curl -T "$RPMFILE" -u "firm1:$APIKEY" "https://api.bintray.com/content/firm1/rpm/zest-writer/$VERSION/$RPMFILE" +curl -T "$RPMFILE" -u "firm1:$APIKEY" "https://api.bintray.com/content/zest-writer/rpm/zest-writer/$VERSION/$RPMFILE?publish=1;override=0" echo "Sign" -curl -u "firm1:$APIKEY" -X POST "https://api.bintray.com/calc_metadata/firm1/rpm" +curl -u "firm1:$APIKEY" -X POST "https://api.bintray.com/calc_metadata/zest-writer/rpm" \ No newline at end of file