Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix scripts android #2138

Merged
merged 15 commits into from
Jan 15, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Build

on:
push:
branches: [ main ]
branches: [ main, web3j-android]
pull_request:
branches:
- main
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ jobs:
OSSRH_GPG_SECRET_KEY_PASSWORD: ${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }}
OSSRH_GPG_SECRET_KEY: ${{ secrets.OSSRH_GPG_SECRET_KEY }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
ACTIONS_STEP_DEBUG: true
steps:
- uses: actions/checkout@v4
- name: Build Workflow Dispatch
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -54,3 +54,5 @@ docs/build
integration-tests/src/test/resources/quorum-test-network/logs

**/lint-baseline.xml
/local.properties
**/*.pro
19 changes: 17 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,21 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

# [4.12.3]() (Upcoming)
# [4.12.4-android]() (Upcoming)

### Bug Fixes

* Fix release scripts [#2138](https://github.com/hyperledger-web3j/web3j/pull/2138)

### Features

*

### BREAKING CHANGES

*

# [4.12.3-android](https://github.com/hyperledger-web3j/web3j/releases/tag/v4.12.3-android) (2025-01-10)

### Bug Fixes

Expand All @@ -17,7 +31,8 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline

### BREAKING CHANGES

*
* Web3j android specific modules [#2110](https://github.com/hyperledger-web3j/web3j/pull/2110)
* Web3j android specific modules [#2122](https://github.com/hyperledger-web3j/web3j/pull/2122)

# [4.12.2](https://github.com/hyperledger/web3j/releases/tag/v4.12.2) (2024-09-18)

Expand Down
28 changes: 0 additions & 28 deletions abi/build.gradle
Original file line number Diff line number Diff line change
@@ -1,33 +1,5 @@
plugins {
id 'com.android.library'
id 'maven-publish'
}

publishing {
publications {
release(MavenPublication) {
groupId = group
artifactId = project.name
version = version

artifact("$buildDir/outputs/aar/${project.name}-release.aar")

pom {
withXml {
def dependenciesNode = asNode().appendNode('dependencies')
configurations.api.allDependencies.each { dependency ->
def dependencyNode = dependenciesNode.appendNode('dependency')
dependencyNode.appendNode('groupId', dependency.group)
dependencyNode.appendNode('artifactId', dependency.name)
dependencyNode.appendNode('version', dependency.version)
}
}
}
}
}
repositories {
mavenLocal()
}
}

android {
Expand Down
30 changes: 2 additions & 28 deletions android-test-utils/build.gradle
Original file line number Diff line number Diff line change
@@ -1,33 +1,5 @@
plugins {
id 'com.android.library'
id 'maven-publish'
}

publishing {
publications {
release(MavenPublication) {
groupId = group
artifactId = project.name
version = version

artifact("$buildDir/outputs/aar/${project.name}-release.aar")

pom {
withXml {
def dependenciesNode = asNode().appendNode('dependencies')
configurations.api.allDependencies.each { dependency ->
def dependencyNode = dependenciesNode.appendNode('dependency')
dependencyNode.appendNode('groupId', dependency.group)
dependencyNode.appendNode('artifactId', dependency.name)
dependencyNode.appendNode('version', dependency.version)
}
}
}
}
}
repositories {
mavenLocal()
}
}

android {
Expand Down Expand Up @@ -58,6 +30,8 @@ android {
}
}

description 'web3j android test lib'

dependencies {

implementation 'androidx.appcompat:appcompat:1.7.0'
Expand Down
29 changes: 2 additions & 27 deletions besu/build.gradle
Original file line number Diff line number Diff line change
@@ -1,34 +1,7 @@
plugins {
id 'com.android.library'
id 'maven-publish'
}

publishing {
publications {
release(MavenPublication) {
groupId = group
artifactId = project.name
version = version

artifact("$buildDir/outputs/aar/${project.name}-release.aar")

pom {
withXml {
def dependenciesNode = asNode().appendNode('dependencies')
configurations.api.allDependencies.each { dependency ->
def dependencyNode = dependenciesNode.appendNode('dependency')
dependencyNode.appendNode('groupId', dependency.group)
dependencyNode.appendNode('artifactId', dependency.name)
dependencyNode.appendNode('version', dependency.version)
}
}
}
}
}
repositories {
mavenLocal()
}
}

android {
namespace 'org.web3j'
Expand Down Expand Up @@ -58,6 +31,8 @@ android {
}
}

description 'web3j besu support project'

dependencies {
api project(':eea')
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.0'
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ allprojects {
}
}

if (project.name != 'integration-tests' && project.name != 'web3j') {
if (project.name != 'integration-tests' && project.name != 'web3j' && project.name != 'java-utils') {
apply from: "$rootDir/gradle/publish/build.gradle"
}
}
28 changes: 0 additions & 28 deletions codegen/build.gradle
Original file line number Diff line number Diff line change
@@ -1,34 +1,6 @@
plugins {
id 'com.android.library'
id 'org.jetbrains.kotlin.android'
id 'maven-publish'
}

publishing {
publications {
release(MavenPublication) {
groupId = group
artifactId = project.name
version = version

artifact("$buildDir/outputs/aar/${project.name}-release.aar")

pom {
withXml {
def dependenciesNode = asNode().appendNode('dependencies')
configurations.api.allDependencies.each { dependency ->
def dependencyNode = dependenciesNode.appendNode('dependency')
dependencyNode.appendNode('groupId', dependency.group)
dependencyNode.appendNode('artifactId', dependency.name)
dependencyNode.appendNode('version', dependency.version)
}
}
}
}
}
repositories {
mavenLocal()
}
}

android {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ public class SolidityFunctionWrapper extends Generator {
+ "or the "
+ SolidityFunctionWrapperGenerator.class.getName()
+ " in the \n"
+ "<a href=\"https://github.com/hyperledger/web3j/tree/main/codegen\">"
+ "<a href=\"https://github.com/hyperledger-web3j/web3j/tree/main/codegen\">"
+ "codegen module</a> to update.\n";

private final boolean useNativeJavaTypes;
Expand Down
28 changes: 0 additions & 28 deletions contracts/build.gradle
Original file line number Diff line number Diff line change
@@ -1,33 +1,5 @@
plugins {
id 'com.android.library'
id 'maven-publish'
}

publishing {
publications {
release(MavenPublication) {
groupId = group
artifactId = project.name
version = version

artifact("$buildDir/outputs/aar/${project.name}-release.aar")

pom {
withXml {
def dependenciesNode = asNode().appendNode('dependencies')
configurations.api.allDependencies.each { dependency ->
def dependencyNode = dependenciesNode.appendNode('dependency')
dependencyNode.appendNode('groupId', dependency.group)
dependencyNode.appendNode('artifactId', dependency.name)
dependencyNode.appendNode('version', dependency.version)
}
}
}
}
}
repositories {
mavenLocal()
}
}

android {
Expand Down
54 changes: 0 additions & 54 deletions core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,36 +2,7 @@ import java.text.SimpleDateFormat

plugins {
id 'com.android.library'
id 'org.ajoberstar.git-publish'
id 'maven-publish'
}
publishing {
publications {
release(MavenPublication) {
groupId = group
artifactId = project.name
version = version

artifact("$buildDir/outputs/aar/${project.name}-release.aar")

pom {
withXml {
def dependenciesNode = asNode().appendNode('dependencies')
configurations.api.allDependencies.each { dependency ->
def dependencyNode = dependenciesNode.appendNode('dependency')
dependencyNode.appendNode('groupId', dependency.group)
dependencyNode.appendNode('artifactId', dependency.name)
dependencyNode.appendNode('version', dependency.version)
}
}
}
}
}
repositories {
mavenLocal()
}
}


android {
namespace 'org.web3j'
Expand Down Expand Up @@ -133,31 +104,6 @@ ext {
ghToken = System.getenv('GITHUB_TOKEN')
}

gitPublish {

if (ghToken) {
repoUri = "https://github.com/${docsPath}.git"
} else {
repoUri = "git@github.com:${docsPath}.git"
}

branch = 'main'

def coreDocs = files("${buildDir.path}/docs/javadoc/")

contents {
from(coreDocs) {
into '/docs/javadoc-api'
}
}

preserve {
include '/**'
}

commitMessage = 'Publishing a new page'
}

// Define the testArtifacts configuration
configurations {
testArtifacts.extendsFrom testImplementation // or testRuntime
Expand Down
28 changes: 0 additions & 28 deletions crypto/build.gradle
Original file line number Diff line number Diff line change
@@ -1,33 +1,5 @@
plugins {
id 'com.android.library'
id 'maven-publish'
}

publishing {
publications {
release(MavenPublication) {
groupId = group
artifactId = project.name
version = version

artifact("$buildDir/outputs/aar/${project.name}-release.aar")

pom {
withXml {
def dependenciesNode = asNode().appendNode('dependencies')
configurations.api.allDependencies.each { dependency ->
def dependencyNode = dependenciesNode.appendNode('dependency')
dependencyNode.appendNode('groupId', dependency.group)
dependencyNode.appendNode('artifactId', dependency.name)
dependencyNode.appendNode('version', dependency.version)
}
}
}
}
}
repositories {
mavenLocal()
}
}

android {
Expand Down
Loading
Loading