Skip to content

Commit cd75572

Browse files
r0h0gg6r0h0gg6
committed
Upgraded to java 17
1 parent ef2d95f commit cd75572

File tree

10 files changed

+70
-72
lines changed

10 files changed

+70
-72
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,11 @@ jobs:
88
runs-on: ubuntu-latest
99
steps:
1010
- uses: actions/checkout@v3
11-
- uses: actions/setup-java@v3
12-
with:
13-
java-version: '11'
14-
distribution: 'temurin'
1511
- uses: actions/setup-node@v3
1612
with:
17-
node-version: '18'
18-
- uses: android-actions/setup-android@v3
13+
node-version: '16'
14+
- uses: android-actions/setup-android@v2
15+
- run: sdkmanager "ndk;21.0.6113669"
1916
- run: npm i -g electrode-native
2017
- uses: actions/checkout@v3
2118
with:
@@ -35,13 +32,13 @@ jobs:
3532
- uses: actions/checkout@v3
3633
- uses: actions/setup-node@v3
3734
with:
38-
node-version: '18'
35+
node-version: '16'
3936
- uses: maxim-lobanov/setup-xcode@v1
4037
with:
4138
xcode-version: '12.4.0'
4239
- run: npm i -g electrode-native
4340
- run: yarn --frozen-lockfile
4441
- working-directory: ios/
45-
run: ern create-container -p ios --out ${PWD}/container -m https://github.com/electrode-io/movies-reloaded-miniapp
42+
run: ern create-container -p ios --out ${PWD}/container -m https://github.com/electrode-io/movies-reloaded-miniapp#java-17-upgrade
4643
- working-directory: ios/container/
4744
run: xcodebuild -workspace "ElectrodeContainer.xcworkspace" -scheme "ElectrodeContainer" -destination "platform=iOS Simulator,name=iPhone 11"

‎android/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
buildscript {
22
repositories {
33
google()
4-
jcenter()
4+
mavenCentral()
55
}
66
dependencies {
7-
classpath 'com.android.tools.build:gradle:3.5.3'
7+
classpath 'com.android.tools.build:gradle:8.7.2'
88
}
99
}
1010

1111
allprojects {
1212
repositories {
1313
google()
14-
jcenter()
14+
mavenCentral()
1515
mavenLocal()
1616
}
1717
}

‎android/ern-navigation-support-lib/build.gradle‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
apply plugin: 'com.android.library'
22

33
android {
4+
namespace 'com.walmartlabs.ern.navigation.support.lib'
45
compileSdkVersion 30
56
buildToolsVersion "30.0.3"
67

@@ -21,8 +22,8 @@ android {
2122
}
2223
}
2324
compileOptions {
24-
sourceCompatibility JavaVersion.VERSION_1_8
25-
targetCompatibility JavaVersion.VERSION_1_8
25+
sourceCompatibility JavaVersion.VERSION_17
26+
targetCompatibility JavaVersion.VERSION_17
2627
}
2728
}
2829

‎android/ern-navigation-support-lib/maven-publish.gradle‎

Lines changed: 49 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
apply plugin: 'maven'
17+
apply plugin: 'maven-publish'
1818
apply plugin: 'signing'
1919

2020
def isReleaseBuild() {
@@ -39,66 +39,64 @@ def getRepositoryPassword() {
3939
return hasProperty('NEXUS_PASSWORD') ? NEXUS_PASSWORD : ""
4040
}
4141

42-
afterEvaluate { project ->
43-
uploadArchives {
44-
repositories {
45-
mavenDeployer {
46-
beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
47-
48-
pom.groupId = GROUP
49-
pom.artifactId = POM_ARTIFACT_ID
50-
pom.version = VERSION_NAME
42+
task androidSourcesJar(type: Jar) {
43+
archiveClassifier = 'sources'
44+
from android.sourceSets.main.java.srcDirs
45+
}
5146

52-
repository(url: getReleaseRepositoryUrl()) {
53-
authentication(userName: getRepositoryUsername(), password: getRepositoryPassword())
47+
publishing {
48+
publications {
49+
release(MavenPublication) {
50+
groupId = GROUP
51+
artifactId = POM_ARTIFACT_ID
52+
version = VERSION_NAME
53+
54+
artifact tasks.androidSourcesJar
55+
56+
pom {
57+
name = POM_NAME
58+
packaging = POM_PACKAGING
59+
description = POM_DESCRIPTION
60+
url = POM_URL
61+
62+
scm {
63+
url = POM_SCM_URL
64+
connection = POM_SCM_CONNECTION
65+
developerConnection = POM_SCM_DEV_CONNECTION
5466
}
55-
snapshotRepository(url: getSnapshotRepositoryUrl()) {
56-
authentication(userName: getRepositoryUsername(), password: getRepositoryPassword())
57-
}
58-
59-
pom.project {
60-
name POM_NAME
61-
packaging POM_PACKAGING
62-
description POM_DESCRIPTION
63-
url POM_URL
6467

65-
scm {
66-
url POM_SCM_URL
67-
connection POM_SCM_CONNECTION
68-
developerConnection POM_SCM_DEV_CONNECTION
69-
}
70-
71-
licenses {
72-
license {
73-
name POM_LICENCE_NAME
74-
url POM_LICENCE_URL
75-
distribution POM_LICENCE_DIST
76-
}
68+
licenses {
69+
license {
70+
name = POM_LICENCE_NAME
71+
url = POM_LICENCE_URL
72+
distribution = POM_LICENCE_DIST
7773
}
74+
}
7875

79-
developers {
80-
developer {
81-
id POM_DEVELOPER_ID
82-
name POM_DEVELOPER_NAME
83-
}
76+
developers {
77+
developer {
78+
id = POM_DEVELOPER_ID
79+
name = POM_DEVELOPER_NAME
8480
}
8581
}
8682
}
8783
}
8884
}
89-
90-
signing {
91-
required { isReleaseBuild() && gradle.taskGraph.hasTask("uploadArchives") }
92-
sign configurations.archives
93-
}
94-
95-
96-
task androidSourcesJar(type: Jar) {
97-
archiveClassifier.set("sources")
98-
from android.sourceSets.main.java.sourceFiles
85+
86+
repositories {
87+
maven {
88+
def releasesRepoUrl = getReleaseRepositoryUrl()
89+
def snapshotsRepoUrl = getSnapshotRepositoryUrl()
90+
url = isReleaseBuild() ? releasesRepoUrl : snapshotsRepoUrl
91+
credentials {
92+
username = getRepositoryUsername()
93+
password = getRepositoryPassword()
94+
}
95+
}
9996
}
97+
}
10098

101-
artifacts {
102-
archives androidSourcesJar
103-
}
99+
signing {
100+
required { isReleaseBuild() && gradle.taskGraph.hasTask("publish") }
101+
sign publishing.publications.release
104102
}

‎android/gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
# Specifies the JVM arguments used for the daemon process.
1111
# The setting is particularly useful for tweaking memory settings.
12-
org.gradle.jvmargs=-Xmx1536m
12+
org.gradle.jvmargs=-Xmx4g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
1313

1414
# When configured, Gradle will run in incubating parallel mode.
1515
# This option should only be used with decoupled projects. More details, visit

‎android/gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

‎android/lib/build.gradle‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
apply plugin: 'com.android.library'
22

33
android {
4+
namespace 'com.walmartlabs.ern.navigation.api.impl'
45
compileSdkVersion 28
56
buildToolsVersion "28.0.3"
67
defaultConfig {
@@ -28,8 +29,8 @@ android {
2829
unitTests.returnDefaultValues = true
2930
}
3031
compileOptions {
31-
sourceCompatibility = '1.8'
32-
targetCompatibility = '1.8'
32+
sourceCompatibility JavaVersion.VERSION_17
33+
targetCompatibility JavaVersion.VERSION_17
3334
}
3435
}
3536

‎android/moviesreloaded/build.gradle‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ apply plugin: 'com.android.application'
22
apply from: 'ern.gradle'
33

44
android {
5+
namespace 'com.walmartlabs.moviesreloaded'
56
compileSdkVersion 28
67

78
defaultConfig {
@@ -22,8 +23,8 @@ android {
2223
}
2324
}
2425
compileOptions {
25-
sourceCompatibility = '1.8'
26-
targetCompatibility = '1.8'
26+
sourceCompatibility JavaVersion.VERSION_17
27+
targetCompatibility JavaVersion.VERSION_17
2728
}
2829
buildToolsVersion = '28.0.3'
2930
ndkVersion "21.0.6113669"

‎android/moviesreloaded/ern.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ final String HOMEDIR = System.getenv('WORKSPACE') ?: System.getProperty('user.ho
44
final String CONTAINER_PATH = "$HOMEDIR/.ern/containergen/out/android"
55

66
task createErnDevContainer(type: Exec) {
7-
commandLine "ern", "create-container", "-m", "https://github.com/electrode-io/movies-reloaded-miniapp.git", "--platform", "android"
7+
commandLine "ern", "create-container", "-m", "https://github.com/electrode-io/movies-reloaded-miniapp.git#java-17-upgrade", "--platform", "android"
88
}
99

1010
task deleteApiImplSrc(type: Delete) {

‎scripts/create-ios-container.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
path="$(pwd)"
2-
ern create-container --out ${path}/ios/container -m https://github.com/electrode-io/movies-reloaded-miniapp --platform ios
2+
ern create-container --out ${path}/ios/container -m https://github.com/electrode-io/movies-reloaded-miniapp#java-17-upgrade --platform ios

0 commit comments

Comments
 (0)