Skip to content

Commit

Permalink
migrate to organisation
Browse files Browse the repository at this point in the history
  • Loading branch information
firm1 committed May 4, 2017
1 parent 0096970 commit 961f745
Show file tree
Hide file tree
Showing 7 changed files with 23 additions and 23 deletions.
14 changes: 7 additions & 7 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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%
Expand All @@ -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
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ repositories {
mavenCentral()
jcenter()
maven {
url "https://dl.bintray.com/firm1/maven"
url "https://dl.bintray.com/zest-writer/maven"
}
}

Expand Down Expand Up @@ -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'
Expand Down
12 changes: 6 additions & 6 deletions doc/rst/install.rst
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,16 @@ 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``.

Os X
####

Téléchargez la dernière version de Zest Writer via `ce lien <https://bintray.com/firm1/dmg/zest-writer/_latestVersion#files>`_, puis installez le fichier dmg.
Téléchargez la dernière version de Zest Writer via `ce lien <https://bintray.com/zest-writer/dmg/zest-writer/_latestVersion#files>`_, puis installez le fichier dmg.

Linux
#####
Expand All @@ -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 :

Expand All @@ -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

Expand All @@ -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 <http://www.java.com/fr/download/>`_ ;
2. téléchargez la dernière version de Zest Writer via `ce lien <https://bintray.com/firm1/maven/zest-writer/_latestVersion#files>`_ ;
2. téléchargez la dernière version de Zest Writer via `ce lien <https://bintray.com/zest-writer/maven/zest-writer/_latestVersion#files>`_ ;
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:
Expand Down
4 changes: 2 additions & 2 deletions scripts/upload_deb.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion scripts/upload_dmg.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
4 changes: 2 additions & 2 deletions scripts/upload_jar.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
6 changes: 3 additions & 3 deletions scripts/upload_rpm.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"

0 comments on commit 961f745

Please sign in to comment.