Compare commits

...

16 Commits

Author SHA1 Message Date
Lee dc1e611503 refactor(edited manifest data)
Co-authored-by: Sebastian Palmqvist <PalmN72@users.noreply.github.com>
2023-10-30 16:48:44 +01:00
Lee 5acbfb698f refactor(removed fastlane plugin file)
Co-authored-by: Sebastian Palmqvist <PalmN72@users.noreply.github.com>
2023-10-30 16:31:25 +01:00
Lee 59dd1cd90d refactor(removed fastlane plugin)
Co-authored-by: Sebastian Palmqvist <PalmN72@users.noreply.github.com>
2023-10-30 16:23:29 +01:00
Lee fa609fa269 refactor(updated mipmap images)
Co-authored-by: Sebastian Palmqvist <PalmN72@users.noreply.github.com>
2023-10-30 16:22:11 +01:00
Lee b1927496db refactor(fixing version code issue)
Co-authored-by: Sebastian Palmqvist <PalmN72@users.noreply.github.com>
2023-10-30 15:11:08 +01:00
Lee 5b594e75e4 refactor(fixing version code issue)
Co-authored-by: Sebastian Palmqvist <PalmN72@users.noreply.github.com>
2023-10-30 14:49:17 +01:00
Lee 0abbee615f refactor(fixing version code issue)
Co-authored-by: Sebastian Palmqvist <PalmN72@users.noreply.github.com>
2023-10-30 14:37:28 +01:00
Lee 90cfe49e71 refactor(fixing version code issue)
Co-authored-by: Sebastian Palmqvist <PalmN72@users.noreply.github.com>
2023-10-30 14:34:15 +01:00
Lee 49ceba502b refactor(fixing version code issue)
Co-authored-by: Sebastian Palmqvist <PalmN72@users.noreply.github.com>
2023-10-30 14:27:24 +01:00
Lee 3360181859 refactor(fixing version code issue)
Co-authored-by: Sebastian Palmqvist <PalmN72@users.noreply.github.com>
2023-10-30 14:26:50 +01:00
Lee a9fb802177 refactor(fixing version code issue)
Co-authored-by: Sebastian Palmqvist <PalmN72@users.noreply.github.com>
2023-10-30 14:19:36 +01:00
Lee 3fdac9da23 refactor(fixing version code issue)
Co-authored-by: Sebastian Palmqvist <PalmN72@users.noreply.github.com>
2023-10-30 13:58:18 +01:00
Lee 101e86b7aa refactor(fixing version code issue)
Co-authored-by: Sebastian Palmqvist <PalmN72@users.noreply.github.com>
2023-10-30 13:43:55 +01:00
Lee 3fbf804353 refactor(removed testing comments)
Co-authored-by: Sebastian Palmqvist <PalmN72@users.noreply.github.com>
2023-10-30 13:13:54 +01:00
Lee 192b3f7522 refactor(tag fix)
Co-authored-by: Sebastian Palmqvist <PalmN72@users.noreply.github.com>
2023-10-30 11:10:21 +01:00
Lee 62a460348d refactor(tag fix)
Co-authored-by: Sebastian Palmqvist <PalmN72@users.noreply.github.com>
2023-10-30 10:56:57 +01:00
21 changed files with 10 additions and 11 deletions

View File

@ -6,4 +6,4 @@ ruby ">= 3.2.2"
gem 'bundler'
gem 'cocoapods', '~> 1.12'
gem 'fastlane'
gem 'dotenv'
gem 'dotenv'

View File

@ -6,7 +6,6 @@
android:name=".MainApplication"
android:label="@string/app_name"
android:icon="@mipmap/ic_launcher"
android:roundIcon="@mipmap/ic_launcher_round"
android:allowBackup="false"
android:theme="@style/AppTheme">
<activity

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.0 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.5 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.3 KiB

After

Width:  |  Height:  |  Size: 4.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.0 KiB

After

Width:  |  Height:  |  Size: 6.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="ic_launcher_background">#FFFFFF</color>
</resources>

View File

@ -1,3 +1,3 @@
<resources>
<string name="app_name">app</string>
<string name="app_name">Öppna Skolplattformen NEW</string>
</resources>

View File

@ -1,9 +1,7 @@
<resources>
<!-- Base application theme. -->
<style name="AppTheme" parent="Theme.AppCompat.DayNight.NoActionBar">
<!-- Customize your theme here. -->
<item name="android:editTextBackground">@drawable/rn_edit_text_material</item>
<item name="android:textColor">#000000</item>
</style>
</resources>

View File

@ -23,9 +23,9 @@ platform :android do
# versionNameOverride = "1.9.0"
if versionNameOverride.nil?
releaseNameSemVerArr = google_play_track_release_names(track: 'internal').max.split('.')
puts "releaseNameSemVerArr: #{releaseNameSemVerArr}"
releaseNameSemVerArr[2] = (releaseNameSemVerArr.last.to_i + 1).to_s
ENV['VERSION_NAME'] = releaseNameSemVerArr.join('.')
ENV['GITTAGNAME'] = ENV['VERSION_NAME'].gsub(/\s+/, '').match(/\((.*?)\)/)[1] + '.' + ENV['VERSION_CODE']
ENV['SUPPLY_VERSION_NAME'] = ENV['VERSION_NAME']
versionFile = File.join(Dir.pwd, '..', 'version', 'version.properties').to_s
commandargs = "-n \"VERSION=#{ENV['VERSION_NAME']}\" > #{versionFile}".to_s
@ -36,7 +36,6 @@ platform :android do
end
puts "Compiling #{ENV['VERSION_NAME']} (#{ENV['VERSION_CODE']}) "
# Dir.pwd when running through Fastlane is app/android/fastlane
releaseFilePath = File.join(Dir.pwd, '..', 'app', "release.jks")
mappingFilePath = File.join(
@ -49,7 +48,7 @@ platform :android do
"release",
"mapping.txt"
)
puts "Hello there - #{ENV['VERSION_CODE']}"
gradle(task: 'clean')
gradle(
@ -95,14 +94,13 @@ platform :android do
system('git config user.email "leesheppard2404@gmail.com"')
system('git config user.name "Github Actions Android Pipeline"')
gitTagName = releaseNameSemVerArr.join('.').gsub(/[\s()]/, '')
add_git_tag(
grouping: "builds",
includes_lane: true,
# prefix: "v#{ENV['VERSION_NAME']}-",
# build_number: ENV['VERSION_CODE'],
tag: gitTagName
tag: "v#{ENV['GITTAGNAME']}"
)
push_to_git_remote(
tags: true