diff --git a/RELEASE-PROCESS.md b/RELEASE-PROCESS.md index b75c284f2..361f06dda 100644 --- a/RELEASE-PROCESS.md +++ b/RELEASE-PROCESS.md @@ -12,15 +12,16 @@ in their main repository. ## Prerequirements - 1. Ensure you got the deprecated maven ant tasks. ( https://maven.apache.org/ant-tasks/download.cgi ) + 1. Ensure you have the deprecated maven ant tasks. ( https://maven.apache.org/ant-tasks/download.cgi ) 2. It should exist at `~/.ant/lib/maven-ant-tasks-2.1.3.jar` - 3. Ensure you got hamcrest-integration, hamcrest-library, hamcrest-core in the hamcrest.home directory. + 3. Ensure you have hamcrest-integration, hamcrest-library, hamcrest-core in the hamcrest.home directory. 4. Ensure junit 4.12 at least in junit.home, ensure the jar file is named `junit4.jar`. - 5. Ensure to have updated the changelog with the changes done. - 6. Ensure that you are configured to build i2p.i2p with Java 8. On Debian it is easiest to set with + 5. Ensure you have the Mockito framework and accompanying documentation in your $JAVA_HOME + 6. Ensure to have updated the changelog with the changes done. + 7. Ensure that you are configured to build i2p.i2p with Java 8. On Debian it is easiest to set with `update-java-alternatives --set java-8-openjdk-amd64` and picking Java 8. **TODO:** add instructions for non-Debian-based systems. - 7. Ensure that you have a Java 1.7 bootclasspath available. (See **Maven Central** step 2A.) + 8. Ensure that you have a Java 1.7 bootclasspath available. (See **Maven Central** step 2A.) ## Get all the dependencies ready @@ -33,10 +34,6 @@ in their main repository. 2. **A)** I2P for Android requires a Java 1.7 bootclasspath, but the servlet jar requires Java 8. So, to do the builds: - First set `javac.compilerargs=-bootclasspath /path/to/java/7/rt.jar:/path/to/java/7/jce.jar` in override.properties - Build with `ant mavenCentral` - - upload everything *except* servlet.jar - - Unset bootclasspath in override.properties - - Build with `ant mavenCentral` - - upload servlet.jar 3. Login to http://oss.sonatype.org for uploading the mavencentral-*.jar bundles. 4. In nexus, choose "Staging Upload" and upload all of the files with upload mode set to "Artifacts with POM". When uploading the files to nexus, you *must* upload the pom.xml files, and all of their artifacts. For each diff --git a/app/build.gradle b/app/build.gradle index b4852bccb..17abd46b1 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -7,7 +7,7 @@ repositories { android { compileSdkVersion 28 defaultConfig { - versionCode 4745259 + versionCode 4745260 versionName "$I2P_VERSION" minSdkVersion 14 targetSdkVersion Integer.parseInt(project.ANDROID_BUILD_TARGET_SDK_VERSION as String) diff --git a/gradle.properties b/gradle.properties index 518c42d86..6a21b5600 100644 --- a/gradle.properties +++ b/gradle.properties @@ -17,4 +17,4 @@ POM_DEVELOPER_EMAIL=hankhill19580@gmail.com ANDROID_BUILD_TARGET_SDK_VERSION=29 ANDROID_BUILD_SDK_VERSION=28 -I2P_VERSION=0.9.48-17 +I2P_VERSION=0.9.49