Compare commits
16 Commits
ebaa2ddaff
...
dc1e611503
Author | SHA1 | Date |
---|---|---|
Lee | dc1e611503 | |
Lee | 5acbfb698f | |
Lee | 59dd1cd90d | |
Lee | fa609fa269 | |
Lee | b1927496db | |
Lee | 5b594e75e4 | |
Lee | 0abbee615f | |
Lee | 90cfe49e71 | |
Lee | 49ceba502b | |
Lee | 3360181859 | |
Lee | a9fb802177 | |
Lee | 3fdac9da23 | |
Lee | 101e86b7aa | |
Lee | 3fbf804353 | |
Lee | 192b3f7522 | |
Lee | 62a460348d |
|
@ -6,7 +6,6 @@
|
||||||
android:name=".MainApplication"
|
android:name=".MainApplication"
|
||||||
android:label="@string/app_name"
|
android:label="@string/app_name"
|
||||||
android:icon="@mipmap/ic_launcher"
|
android:icon="@mipmap/ic_launcher"
|
||||||
android:roundIcon="@mipmap/ic_launcher_round"
|
|
||||||
android:allowBackup="false"
|
android:allowBackup="false"
|
||||||
android:theme="@style/AppTheme">
|
android:theme="@style/AppTheme">
|
||||||
<activity
|
<activity
|
||||||
|
|
Before Width: | Height: | Size: 3.0 KiB After Width: | Height: | Size: 2.1 KiB |
After Width: | Height: | Size: 3.0 KiB |
Before Width: | Height: | Size: 4.9 KiB |
Before Width: | Height: | Size: 2.0 KiB After Width: | Height: | Size: 1.5 KiB |
After Width: | Height: | Size: 1.9 KiB |
Before Width: | Height: | Size: 2.8 KiB |
Before Width: | Height: | Size: 4.5 KiB After Width: | Height: | Size: 2.9 KiB |
After Width: | Height: | Size: 4.3 KiB |
Before Width: | Height: | Size: 6.9 KiB |
Before Width: | Height: | Size: 6.3 KiB After Width: | Height: | Size: 4.4 KiB |
After Width: | Height: | Size: 7.8 KiB |
Before Width: | Height: | Size: 10 KiB |
Before Width: | Height: | Size: 9.0 KiB After Width: | Height: | Size: 6.3 KiB |
After Width: | Height: | Size: 12 KiB |
Before Width: | Height: | Size: 15 KiB |
|
@ -0,0 +1,4 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<resources>
|
||||||
|
<color name="ic_launcher_background">#FFFFFF</color>
|
||||||
|
</resources>
|
|
@ -1,3 +1,3 @@
|
||||||
<resources>
|
<resources>
|
||||||
<string name="app_name">app</string>
|
<string name="app_name">Öppna Skolplattformen NEW</string>
|
||||||
</resources>
|
</resources>
|
||||||
|
|
|
@ -1,9 +1,7 @@
|
||||||
<resources>
|
<resources>
|
||||||
|
|
||||||
<!-- Base application theme. -->
|
<!-- Base application theme. -->
|
||||||
<style name="AppTheme" parent="Theme.AppCompat.DayNight.NoActionBar">
|
<style name="AppTheme" parent="Theme.AppCompat.DayNight.NoActionBar">
|
||||||
<!-- Customize your theme here. -->
|
<!-- Customize your theme here. -->
|
||||||
<item name="android:editTextBackground">@drawable/rn_edit_text_material</item>
|
<item name="android:textColor">#000000</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
</resources>
|
</resources>
|
||||||
|
|
|
@ -23,9 +23,9 @@ platform :android do
|
||||||
# versionNameOverride = "1.9.0"
|
# versionNameOverride = "1.9.0"
|
||||||
if versionNameOverride.nil?
|
if versionNameOverride.nil?
|
||||||
releaseNameSemVerArr = google_play_track_release_names(track: 'internal').max.split('.')
|
releaseNameSemVerArr = google_play_track_release_names(track: 'internal').max.split('.')
|
||||||
puts "releaseNameSemVerArr: #{releaseNameSemVerArr}"
|
|
||||||
releaseNameSemVerArr[2] = (releaseNameSemVerArr.last.to_i + 1).to_s
|
releaseNameSemVerArr[2] = (releaseNameSemVerArr.last.to_i + 1).to_s
|
||||||
ENV['VERSION_NAME'] = releaseNameSemVerArr.join('.')
|
ENV['VERSION_NAME'] = releaseNameSemVerArr.join('.')
|
||||||
|
ENV['GITTAGNAME'] = ENV['VERSION_NAME'].gsub(/\s+/, '').match(/\((.*?)\)/)[1] + '.' + ENV['VERSION_CODE']
|
||||||
ENV['SUPPLY_VERSION_NAME'] = ENV['VERSION_NAME']
|
ENV['SUPPLY_VERSION_NAME'] = ENV['VERSION_NAME']
|
||||||
versionFile = File.join(Dir.pwd, '..', 'version', 'version.properties').to_s
|
versionFile = File.join(Dir.pwd, '..', 'version', 'version.properties').to_s
|
||||||
commandargs = "-n \"VERSION=#{ENV['VERSION_NAME']}\" > #{versionFile}".to_s
|
commandargs = "-n \"VERSION=#{ENV['VERSION_NAME']}\" > #{versionFile}".to_s
|
||||||
|
@ -36,7 +36,6 @@ platform :android do
|
||||||
end
|
end
|
||||||
puts "Compiling #{ENV['VERSION_NAME']} (#{ENV['VERSION_CODE']}) "
|
puts "Compiling #{ENV['VERSION_NAME']} (#{ENV['VERSION_CODE']}) "
|
||||||
|
|
||||||
|
|
||||||
# Dir.pwd when running through Fastlane is app/android/fastlane
|
# Dir.pwd when running through Fastlane is app/android/fastlane
|
||||||
releaseFilePath = File.join(Dir.pwd, '..', 'app', "release.jks")
|
releaseFilePath = File.join(Dir.pwd, '..', 'app', "release.jks")
|
||||||
mappingFilePath = File.join(
|
mappingFilePath = File.join(
|
||||||
|
@ -49,7 +48,7 @@ platform :android do
|
||||||
"release",
|
"release",
|
||||||
"mapping.txt"
|
"mapping.txt"
|
||||||
)
|
)
|
||||||
|
puts "Hello there - #{ENV['VERSION_CODE']}"
|
||||||
|
|
||||||
gradle(task: 'clean')
|
gradle(task: 'clean')
|
||||||
gradle(
|
gradle(
|
||||||
|
@ -95,14 +94,13 @@ platform :android do
|
||||||
system('git config user.email "leesheppard2404@gmail.com"')
|
system('git config user.email "leesheppard2404@gmail.com"')
|
||||||
system('git config user.name "Github Actions Android Pipeline"')
|
system('git config user.name "Github Actions Android Pipeline"')
|
||||||
|
|
||||||
gitTagName = releaseNameSemVerArr.join('.').gsub(/[\s()]/, '')
|
|
||||||
|
|
||||||
add_git_tag(
|
add_git_tag(
|
||||||
grouping: "builds",
|
grouping: "builds",
|
||||||
includes_lane: true,
|
includes_lane: true,
|
||||||
# prefix: "v#{ENV['VERSION_NAME']}-",
|
# prefix: "v#{ENV['VERSION_NAME']}-",
|
||||||
# build_number: ENV['VERSION_CODE'],
|
# build_number: ENV['VERSION_CODE'],
|
||||||
tag: gitTagName
|
tag: "v#{ENV['GITTAGNAME']}"
|
||||||
)
|
)
|
||||||
push_to_git_remote(
|
push_to_git_remote(
|
||||||
tags: true
|
tags: true
|
||||||
|
|