Skip to content
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
26 changes: 21 additions & 5 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,13 +1,29 @@
import groovy.json.JsonSlurper

apply plugin: "com.android.application"
apply plugin: "org.jetbrains.kotlin.android"
apply plugin: "com.facebook.react"

// Read version from package.json
def getVersionFromPackageJson() {
def packageJson = new JsonSlurper().parse(file("../../package.json"))
return packageJson.version
def packageJsonText = file("../../package.json").getText("UTF-8")
def versionMatcher = (packageJsonText =~ /"version"\s*:\s*"([^"]+)"/)
if (versionMatcher.find()) {
return versionMatcher.group(1)
}
return "1.0.0"
}

// Convert semver (major.minor.patch) to monotonic Android versionCode.
// Example: 1.4.1 -> 10401
def getVersionCodeFromPackageJson() {
def version = getVersionFromPackageJson()
def numericPart = version.tokenize('-')[0]
def parts = numericPart.tokenize('.')

int major = parts.size() > 0 ? parts[0].toInteger() : 1
int minor = parts.size() > 1 ? parts[1].toInteger() : 0
int patch = parts.size() > 2 ? parts[2].toInteger() : 0

return major * 10000 + minor * 100 + patch
Comment on lines +18 to +26
}

/**
Expand Down Expand Up @@ -90,7 +106,7 @@ android {
applicationId "com.flickv4"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
versionCode getVersionCodeFromPackageJson()
versionName getVersionFromPackageJson()
}
signingConfigs {
Expand Down
2 changes: 1 addition & 1 deletion android/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ android.useAndroidX=true
# Use this property to specify which architecture you want to build.
# You can also override it from the CLI using
# ./gradlew <task> -PreactNativeArchitectures=x86_64
reactNativeArchitectures=arm64-v8a
reactNativeArchitectures=arm64-v8a,armeabi-v7a

# Use this property to enable support to the new architecture.
# This will allow you to use TurboModules and the Fabric render in
Expand Down
Binary file modified builds/android/1.4.1/app-release.apk
Binary file not shown.
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
{
"name": "Flickv4",
"version": "1.4.0",
"version": "1.4.1",
"private": true,
"scripts": {
"clean:android": "cd android && ./gradlew clean",
"android": "react-native run-android",
"build:android": "react-native run-android --mode=release",
"assemble:android": "cd android && ./gradlew clean && ./gradlew assembleRelease",
"ios": "react-native run-ios",
"lint": "eslint .",
"start": "react-native start --reset-cache",
Expand Down