Skip to content

Commit

Permalink
fastlane setup. storefront source control. #11
Browse files Browse the repository at this point in the history
  • Loading branch information
erosson committed Jun 1, 2020
1 parent 7465b37 commit 439800f
Show file tree
Hide file tree
Showing 74 changed files with 396 additions and 215 deletions.
11 changes: 9 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,14 @@ app.ipa
app.apk
*.log
.env

.version.json
.bundle
vendor
/android/fastlane/.auth.json
/ios/fastlane/.auth.env
/ios/fastlane/metadata/trade_representative_contact_information
/ios/fastlane/metadata/review_information/phone_number.txt

android/app/src/main/assets/shell-app-manifest.json
android/app/src/main/assets/shell-app.bundle
Expand Down Expand Up @@ -291,7 +298,7 @@ Temporary Items
*.cer
*.bak

# Fastlane
# Fastlane
# fastlane specific
report.xml

Expand All @@ -310,7 +317,7 @@ android/app/build/
android/build/


# Project specific
# Project specific
.expo
.idea
prodMinSdkDevKernel/
Expand Down
179 changes: 179 additions & 0 deletions android/Gemfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,179 @@
GEM
remote: https://rubygems.org/
specs:
CFPropertyList (3.0.2)
addressable (2.7.0)
public_suffix (>= 2.0.2, < 5.0)
atomos (0.1.3)
aws-eventstream (1.1.0)
aws-partitions (1.322.0)
aws-sdk-core (3.97.0)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.239.0)
aws-sigv4 (~> 1.1)
jmespath (~> 1.0)
aws-sdk-kms (1.32.0)
aws-sdk-core (~> 3, >= 3.71.0)
aws-sigv4 (~> 1.1)
aws-sdk-s3 (1.67.0)
aws-sdk-core (~> 3, >= 3.96.1)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.1)
aws-sigv4 (1.1.4)
aws-eventstream (~> 1.0, >= 1.0.2)
babosa (1.0.3)
claide (1.0.3)
colored (1.2)
colored2 (3.1.2)
commander-fastlane (4.4.6)
highline (~> 1.7.2)
declarative (0.0.10)
declarative-option (0.1.0)
digest-crc (0.5.1)
domain_name (0.5.20190701)
unf (>= 0.0.5, < 1.0.0)
dotenv (2.7.5)
emoji_regex (1.0.1)
excon (0.73.0)
faraday (1.0.1)
multipart-post (>= 1.2, < 3)
faraday-cookie_jar (0.0.6)
faraday (>= 0.7.4)
http-cookie (~> 1.0.0)
faraday_middleware (1.0.0)
faraday (~> 1.0)
fastimage (2.1.7)
fastlane (2.148.1)
CFPropertyList (>= 2.3, < 4.0.0)
addressable (>= 2.3, < 3.0.0)
aws-sdk-s3 (~> 1.0)
babosa (>= 1.0.2, < 2.0.0)
bundler (>= 1.12.0, < 3.0.0)
colored
commander-fastlane (>= 4.4.6, < 5.0.0)
dotenv (>= 2.1.1, < 3.0.0)
emoji_regex (>= 0.1, < 2.0)
excon (>= 0.71.0, < 1.0.0)
faraday (>= 0.17, < 2.0)
faraday-cookie_jar (~> 0.0.6)
faraday_middleware (>= 0.13.1, < 2.0)
fastimage (>= 2.1.0, < 3.0.0)
gh_inspector (>= 1.1.2, < 2.0.0)
google-api-client (>= 0.37.0, < 0.39.0)
google-cloud-storage (>= 1.15.0, < 2.0.0)
highline (>= 1.7.2, < 2.0.0)
json (< 3.0.0)
jwt (~> 2.1.0)
mini_magick (>= 4.9.4, < 5.0.0)
multi_xml (~> 0.5)
multipart-post (~> 2.0.0)
plist (>= 3.1.0, < 4.0.0)
public_suffix (~> 2.0.0)
rubyzip (>= 1.3.0, < 2.0.0)
security (= 0.1.3)
simctl (~> 1.6.3)
slack-notifier (>= 2.0.0, < 3.0.0)
terminal-notifier (>= 2.0.0, < 3.0.0)
terminal-table (>= 1.4.5, < 2.0.0)
tty-screen (>= 0.6.3, < 1.0.0)
tty-spinner (>= 0.8.0, < 1.0.0)
word_wrap (~> 1.0.0)
xcodeproj (>= 1.13.0, < 2.0.0)
xcpretty (~> 0.3.0)
xcpretty-travis-formatter (>= 0.0.3)
gh_inspector (1.1.3)
google-api-client (0.38.0)
addressable (~> 2.5, >= 2.5.1)
googleauth (~> 0.9)
httpclient (>= 2.8.1, < 3.0)
mini_mime (~> 1.0)
representable (~> 3.0)
retriable (>= 2.0, < 4.0)
signet (~> 0.12)
google-cloud-core (1.5.0)
google-cloud-env (~> 1.0)
google-cloud-errors (~> 1.0)
google-cloud-env (1.3.2)
faraday (>= 0.17.3, < 2.0)
google-cloud-errors (1.0.1)
google-cloud-storage (1.26.2)
addressable (~> 2.5)
digest-crc (~> 0.4)
google-api-client (~> 0.33)
google-cloud-core (~> 1.2)
googleauth (~> 0.9)
mini_mime (~> 1.0)
googleauth (0.12.0)
faraday (>= 0.17.3, < 2.0)
jwt (>= 1.4, < 3.0)
memoist (~> 0.16)
multi_json (~> 1.11)
os (>= 0.9, < 2.0)
signet (~> 0.14)
highline (1.7.10)
http-cookie (1.0.3)
domain_name (~> 0.5)
httpclient (2.8.3)
jmespath (1.4.0)
json (2.3.0)
jwt (2.1.0)
memoist (0.16.2)
mini_magick (4.10.1)
mini_mime (1.0.2)
multi_json (1.14.1)
multi_xml (0.6.0)
multipart-post (2.0.0)
nanaimo (0.2.6)
naturally (2.2.0)
os (1.1.0)
plist (3.5.0)
public_suffix (2.0.5)
representable (3.0.4)
declarative (< 0.1.0)
declarative-option (< 0.2.0)
uber (< 0.2.0)
retriable (3.1.2)
rouge (2.0.7)
rubyzip (1.3.0)
security (0.1.3)
signet (0.14.0)
addressable (~> 2.3)
faraday (>= 0.17.3, < 2.0)
jwt (>= 1.5, < 3.0)
multi_json (~> 1.10)
simctl (1.6.8)
CFPropertyList
naturally
slack-notifier (2.3.2)
terminal-notifier (2.0.0)
terminal-table (1.8.0)
unicode-display_width (~> 1.1, >= 1.1.1)
tty-cursor (0.7.1)
tty-screen (0.8.0)
tty-spinner (0.9.3)
tty-cursor (~> 0.7)
uber (0.1.0)
unf (0.1.4)
unf_ext
unf_ext (0.0.7.7)
unicode-display_width (1.7.0)
word_wrap (1.0.0)
xcodeproj (1.16.0)
CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.3)
claide (>= 1.0.2, < 2.0)
colored2 (~> 3.1)
nanaimo (~> 0.2.6)
xcpretty (0.3.0)
rouge (~> 2.0.7)
xcpretty-travis-formatter (1.0.0)
xcpretty (~> 0.2, >= 0.0.7)

PLATFORMS
ruby

DEPENDENCIES
fastlane

BUNDLED WITH
2.1.4
2 changes: 1 addition & 1 deletion android/fastlane/Appfile
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
json_key_file("/Users/flaque/.keys/api-fastlane.json") # Path to the json secret file - Follow https://docs.fastlane.tools/actions/supply/#setup to get one
json_key_file("./fastlane/.auth.json") # Path to the json secret file - Follow https://docs.fastlane.tools/actions/supply/#setup to get one
package_name("org.erosson.freecbt") # e.g. com.krausefx.app
115 changes: 62 additions & 53 deletions android/fastlane/Fastfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,58 +16,67 @@
default_platform(:android)

platform :android do
desc "Assemble Build"
lane :build do |options|
gradle(task: 'clean assemble', build_type: "release", properties: {
"android.injected.signing.store.file" => "/Users/flaque/.keystores/android",
"android.injected.signing.store.password" => ENV['KEYSTORE_PASSWORD'],
"android.injected.signing.key.alias" => "key0",
"android.injected.signing.key.password" => ENV['KEY_PASSWORD'],
})
end
# desc "Update storefront text and screenshots"
# lane :storefront do |options|
# upload_to_play_store(
# skip_upload_apk: true,
# skip_upload_aab: true,
# skip_upload_changelogs: true,
# )
# end

lane :bump_version_code do
path = '../app/build.gradle'
re = /versionCode\s+(\d+)/

s = File.read(path)
versionCode = s[re, 1].to_i
s[re, 1] = (versionCode + 1).to_s

f = File.new(path, 'w')
f.write(s)
f.close
end

desc "Runs all the tests"
lane :test do
gradle(task: "test")
end

desc "Submit a new Internal"
lane :internal do
bump_version_code
gradle(task: 'clean assemble', build_type: "release", properties: {
"android.injected.signing.store.file" => "/Users/flaque/.keystores/android",
"android.injected.signing.store.password" => ENV['KEYSTORE_PASSWORD'],
"android.injected.signing.key.alias" => "key0",
"android.injected.signing.key.password" => ENV['KEY_PASSWORD'],
})
upload_to_play_store(
track: 'internal',
skip_upload_metadata: true,
skip_upload_images: true,
skip_upload_screenshots: true,
skip_upload_apk: false
)

# sh "your_script.sh"
# You can also use other beta testing services here
end

desc "Deploy a new version to the Google Play"
lane :deploy do
gradle(task: "clean assembleRelease")
upload_to_play_store
end
# desc "Assemble Build"
# lane :build do |options|
# gradle(task: 'clean assemble', build_type: "release", properties: {
# "android.injected.signing.store.file" => "/Users/flaque/.keystores/android",
# "android.injected.signing.store.password" => ENV['KEYSTORE_PASSWORD'],
# "android.injected.signing.key.alias" => "key0",
# "android.injected.signing.key.password" => ENV['KEY_PASSWORD'],
# })
# end
#
# lane :bump_version_code do
# path = '../app/build.gradle'
# re = /versionCode\s+(\d+)/
#
# s = File.read(path)
# versionCode = s[re, 1].to_i
# s[re, 1] = (versionCode + 1).to_s
#
# f = File.new(path, 'w')
# f.write(s)
# f.close
# end
#
# desc "Runs all the tests"
# lane :test do
# gradle(task: "test")
# end
#
# desc "Submit a new Internal"
# lane :internal do
# bump_version_code
# gradle(task: 'clean assemble', build_type: "release", properties: {
# "android.injected.signing.store.file" => "/Users/flaque/.keystores/android",
# "android.injected.signing.store.password" => ENV['KEYSTORE_PASSWORD'],
# "android.injected.signing.key.alias" => "key0",
# "android.injected.signing.key.password" => ENV['KEY_PASSWORD'],
# })
# upload_to_play_store(
# track: 'internal',
# skip_upload_metadata: true,
# skip_upload_images: true,
# skip_upload_screenshots: true,
# skip_upload_apk: false
# )
#
# # sh "your_script.sh"
# # You can also use other beta testing services here
# end
#
# desc "Deploy a new version to the Google Play"
# lane :deploy do
# gradle(task: "clean assembleRelease")
# upload_to_play_store
# end
end
26 changes: 3 additions & 23 deletions android/fastlane/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,31 +16,11 @@ or alternatively using `brew cask install fastlane`

# Available Actions
## Android
### android build
### android storefront
```
fastlane android build
fastlane android storefront
```
Assemble Build
### android bump_version_code
```
fastlane android bump_version_code
```

### android test
```
fastlane android test
```
Runs all the tests
### android internal
```
fastlane android internal
```
Submit a new Internal
### android deploy
```
fastlane android deploy
```
Deploy a new version to the Google Play
Update storefront text

----

Expand Down
1 change: 0 additions & 1 deletion android/fastlane/metadata/android/en-US/changelogs/1.txt

This file was deleted.

1 change: 1 addition & 0 deletions android/fastlane/metadata/android/en-US/changelogs/18.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Reduced disk space requirements
12 changes: 8 additions & 4 deletions android/fastlane/metadata/android/en-US/full_description.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
Quirk is an open source thought diary for Cognitive Behavioral Therapy (CBT).
FreeCBT is an open source thought diary for Cognitive Behavioral Therapy (CBT).


Cognitive Behavioral Therapy (CBT) is the "gold standard" of psychotherapy and is widely considered to be one of the most effective, evidence backed treatments for depression, anxiety, and panic. If you go into just about any therapist or psychiatrist, CBT will likely be one of the first treatments they try.

Quirk is a companion and self-help app for one of the most common formats of CBT. You may have heard it called "the three column technique" or "catch it, check it, change it." Your brain is really good at making you feel exactly what you're thinking. Often, we find ourselves thinking "automatic negative thoughts" that lead us to fume on something that may not be true. That can cause us to feel depressed or anxious.

CBT helps you record "automatic thoughts," challenge them with cognitive distortions and then train your brain with an alternative thought.
FreeCBT is a companion and self-help app for one of the most common formats of CBT. You may have heard it called "the three column technique" or "catch it, check it, change it." Your brain is really good at making you feel exactly what you're thinking. Often, we find ourselves thinking "automatic negative thoughts" that lead us to fume on something that may not be true. That can cause us to feel depressed or anxious.


CBT helps you record "automatic thoughts," challenge them with cognitive distortions and then train your brain with an alternative thought. If you do it enough, you can change your thoughts, your moods and your behavior.


The app is open source under the GPL. You can find the code on Github at: https://github.com/Flaque/quirk
FreeCBT, a fork of Quirk, is open source under the GPL. You can find the code on Github at: https://github.com/erosson/freecbt
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/fastlane/metadata/android/en-US/images/icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Loading

0 comments on commit 439800f

Please sign in to comment.