Merge pull request #1094 from StoDevX/play-betas

hawkrives · web-flow · commit bca39b1d0c89 · 2017-05-19T23:15:28.000-05:00
Add Google Play betas
diff --git a/.gitignore b/.gitignore
@@ -52,17 +52,22 @@ coverage
 # fastlane specific
 fastlane/report.xml
 
-# deliver temporary files
-fastlane/Preview.html
+# deliver's temporary files
+Preview.html
 
-# snapshot generated screenshots
+# snapshot's generated screenshots
 fastlane/screenshots
 
-# scan temporary files
+# scan's temporary files
 fastlane/test_output
 
 # deploy key
 scripts/travisci_deploy_key
+fastlane/play-private-key.json
 
 # generated files
 docs/
+
+# android keystores
+android/app/signing.properties
+*.keystore
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -81,7 +81,7 @@ apply from: "../../node_modules/react-native-code-push/android/codepush.gradle"
  * Upload all the APKs to the Play Store and people will download
  * the correct one based on the CPU architecture of their device.
  */
-def enableSeparateBuildPerCPUArchitecture = false
+def enableSeparateBuildPerCPUArchitecture = true
 
 /**
  * Run Proguard to shrink the Java bytecode in release builds.
@@ -95,8 +95,8 @@ android {
     defaultConfig {
         applicationId "com.allaboutolaf"
         minSdkVersion 16
-        targetSdkVersion 25
-        versionCode 1
+        targetSdkVersion 23
+        versionCode 5
         versionName "2.2.3"
         ndk {
             abiFilters "armeabi-v7a", "x86"
@@ -108,6 +108,10 @@ android {
             gmaps_key: System.getenv("GMAPS_KEY") ?: "",
         ]
     }
+    signingConfigs {
+        // the signingConfig is configured below
+        release
+    }
     splits {
         abi {
             reset()
@@ -120,6 +124,7 @@ android {
         release {
             minifyEnabled enableProguardInReleaseBuilds
             proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
+            signingConfig signingConfigs.release
         }
     }
     // applicationVariants are e.g. debug, release
@@ -143,6 +148,40 @@ android {
     }
 }
 
+// borrowed from https://gist.github.com/gabrielemariotti/6856974
+def propFile = new File('android/app//signing.properties')
+if (propFile.canRead()) {
+    def Properties props = new Properties()
+    props.load(new FileInputStream(propFile))
+    if (props != null
+            && props.containsKey('STORE_FILE')
+            && props.containsKey('STORE_PASSWORD')
+            && props.containsKey('KEY_ALIAS')
+            && props.containsKey('KEY_PASSWORD')
+    ) {
+        logger.info 'android/app/signing.properties is fully functional.'
+        android.signingConfigs.release.storeFile = file(props['STORE_FILE'])
+        android.signingConfigs.release.storePassword = props['STORE_PASSWORD']
+        android.signingConfigs.release.keyAlias = props['KEY_ALIAS']
+        android.signingConfigs.release.keyPassword = props['KEY_PASSWORD']
+    } else {
+        println 'android/app/signing.properties found, but some entries are missing.'
+        if (props == null) {
+            logger.warn '`props` was null'
+        } else {
+            logger.warn "has STORE_FILE: ${props.containsKey('STORE_FILE')}"
+            logger.warn "has STORE_PASSWORD: ${props.containsKey('STORE_PASSWORD')}"
+            logger.warn "has KEY_ALIAS: ${props.containsKey('KEY_ALIAS')}"
+            logger.warn "has KEY_PASSWORD: ${props.containsKey('KEY_PASSWORD')}"
+        }
+        android.buildTypes.release.signingConfig = null
+    }
+} else {
+    logger.warn 'android/app/signing.properties not found.'
+    logger.warn "cwd: ${new File(".").absolutePath}"
+    android.buildTypes.release.signingConfig = null
+}
+
 dependencies {
     // please keep this list sorted
     compile project(':bugsnag-react-native')
diff --git a/android/gradle.properties b/android/gradle.properties
@@ -16,6 +16,6 @@ org.gradle.jvmargs=-Xmx1536m
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-# org.gradle.parallel=true
+org.gradle.parallel=true
 
 android.useDeprecatedNdk=true
diff --git a/fastlane/Appfile b/fastlane/Appfile
@@ -4,5 +4,7 @@ app_identifier 'NFMTHAZVS9.com.drewvolz.stolaf'
 # Your Apple email address
 apple_id 'sgawebmaster@stolaf.edu'
 
-# you can even provide different app identifiers, Apple IDs and team names per lane:
-# More information: https://github.com/fastlane/fastlane/blob/master/fastlane/docs/Appfile.md
+# This is a private key. It is not included in the repository.
+# Contact odt@stolaf.edu or another admin if you need access.
+json_key_file 'fastlane/play-private-key.json'
+package_name 'com.allaboutolaf'
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
@@ -6,6 +6,8 @@
 # Set a minimum version for fastlane
 fastlane_version '2.19.0'
 
+require 'fileutils'
+
 import 'lib/before_all.rb'
 import 'lib/util.rb'
 
diff --git a/fastlane/README.md b/fastlane/README.md
@@ -49,6 +49,11 @@ Build the release notes: branch, commit hash, changelog
 fastlane bundle_data
 ```
 run `npm run bundle-data`
+### keys
+```
+fastlane keys
+```
+Set up the private keys + environment variables for local development
 
 ----
 
@@ -78,6 +83,11 @@ Include the build number in the version string
 fastlane android codepush
 ```
 
+### android matchesque
+```
+fastlane android matchesque
+```
+extract the android keys from the match repo
 
 ----
 
diff --git a/fastlane/actions/get_gradle_version_code.rb b/fastlane/actions/get_gradle_version_code.rb
@@ -0,0 +1,45 @@
+module Fastlane
+  module Actions
+    class GetGradleVersionCodeAction < Action
+      def self.run(params)
+        gradle_path = params[:gradle_path]
+        version_code = nil
+
+        File.foreach(gradle_path) do |line|
+          if line.include? 'versionCode '
+            components = line.strip.split(' ')
+            version_code = components[1].tr('"', '')
+          end
+        end
+
+        if version_code.nil?
+          UI.user_error! "Could not find the version code in #{gradle_path}"
+        else
+          UI.success "Version code: #{version_code}"
+        end
+
+        version_code.to_i
+      end
+
+      def self.description
+        'Get the version code of your android project.'
+      end
+
+      def self.authors
+        ['Hawken Rives']
+      end
+
+      def self.available_options
+        [
+          FastlaneCore::ConfigItem.new(key: :gradle_path,
+                                       description: 'The path to the build.gradle file',
+                                       type: String),
+        ]
+      end
+
+      def self.is_supported?(platform)
+        [:android].include?(platform)
+      end
+    end
+  end
+end
diff --git a/fastlane/actions/set_gradle_version_code.rb b/fastlane/actions/set_gradle_version_code.rb
@@ -47,7 +47,8 @@ def self.available_options
           FastlaneCore::ConfigItem.new(key: :gradle_path,
                                        description: 'The path to the build.gradle file'),
           FastlaneCore::ConfigItem.new(key: :version_code,
-                                       description: 'The version to change to'),
+                                       description: 'The version to change to',
+                                       type: Integer),
         ]
       end
 
diff --git a/fastlane/lib/util.rb b/fastlane/lib/util.rb
@@ -9,19 +9,21 @@ def authorize_ci_for_keys
   end
 end
 
-# Get the commit of the latest build on HockeyApp
-def hockeyapp_version_commit
-  latest_hockeyapp_notes[:commit_hash]
-end
-
 # Gets the version, either from Travis or from Hockey
 def current_build_number
   if ENV.key?('TRAVIS_BUILD_NUMBER')
     return ENV['TRAVIS_BUILD_NUMBER']
   end
 
   begin
-    (latest_testflight_build_number + 1).to_s
+    case lane_context[:PLATFORM_NAME]
+    when :android
+      UI.input "Please enter a build number: "
+    when :ios
+      (latest_testflight_build_number + 1).to_s
+    else
+      UI.input "Please enter a build number: "
+    end
   rescue
     '1'
   end
diff --git a/fastlane/metadata/android/en-US/changelogs/2.txt b/fastlane/metadata/android/en-US/changelogs/2.txt
@@ -0,0 +1,12 @@
+We can't wait to show you what we've been up to!
+
+In this version:
+- You can reorder the home screen now!
+- Check out the Northfield events calendar!
+- Discover new student orgs to join!
+- Meals Remaining in SIS is back!
+- Hours redesign! More buildings! More hours!
+- Menus redesign! Better menus! Faster loading!
+- There's a new FAQs section in Settings! Check it out.
+- The Pause Events calendar is now included!
+- Numerous Bug Fixes
diff --git a/fastlane/metadata/android/en-US/changelogs/3.txt b/fastlane/metadata/android/en-US/changelogs/3.txt
@@ -0,0 +1,3 @@
+Turns out that v2.1.0 had a problem with BonApp's "Humane" dietary filter; we had a talk with the app and came to an understanding about "humane" meat products. We also talked about not crashing when you see something you don't expect, so when BonApp rolls out another new dietary type we should be 💯.
+
+We also added menus for Carleton's campus – go see the other side of the river! Your Ole Card will let you in, and it just uses your meal plan. (It won't let you in their doors, though.)
diff --git a/fastlane/metadata/android/en-US/changelogs/4.txt b/fastlane/metadata/android/en-US/changelogs/4.txt
@@ -0,0 +1,14 @@
+NEW
+• Allow switching between today's menus!
+• Enable links in News articles!
+• Add thumbnails to the News article lists!
+• Enabled the Maps screen!
+• Add a "Share" button to News articles!
+• Solved the login issues for Balances!
+
+FIXES
+• Add an analytics opt-out switch
+• Update the Northfield Lines store link
+• Let the screen title expand
+• Improve the anti-code filters for the menus
+• Many more bug fixes and improvements
diff --git a/fastlane/metadata/android/en-US/full_description.txt b/fastlane/metadata/android/en-US/full_description.txt
@@ -0,0 +1,39 @@
+All About Olaf is a student-oriented application that provides simple and intuitive access to campus information and resources. 
+
+(This app is created, supported, and managed by the St. Olaf College Student Government Association (SGA); this is not officially developed by staff of  St. Olaf College.)
+
+MENUS
+Learn what’s being served in the cafeteria, and plan your next order at The Cage with a full listing of prices and offerings.
+
+SIS
+Access your balances, your meal plan information, and your course schedule for the current and past semesters. Stay on time, and on budget.
+
+BUILDING HOURS
+Never show up to a locked building again!
+
+CALENDAR
+Plan your days with calendar updates from the college and SGA. Every campus-wide event will be featured here.
+
+DIRECTORY
+Find email addresses, match names with faces, and keep track of all the amazing people on the Hill.
+
+STREAMING MEDIA
+Browse the many St. Olaf webcams, watch the sunset from your bedroom, and check out the goings-on in Buntrock Commons with the Hi Mom cam!
+
+NEWS
+Keep track of the happenings in academic departments, follow the PoliticOle, and read articles from the student newspaper, the Manitou Mess! Also includes Oleville, with the latest from all of SGA, including the famous weekly #HillHappenings emails.
+
+CAMPUS MAP
+Never get lost again with this interactive map of campus!
+
+IMPORTANT CONTACTS
+From emergency contacts to Pause orders, it’s easy to access important phone numbers when you need them.
+
+TRANSPORTATION
+Follow the bus on it’s route to maximize your time in town, and explore other transportation options around Northfield and the surrounding area.
+
+CAMPUS DICTIONARY
+What does SGA stand for? Who’s Ole? What are these branches? Everyone needs a dictionary, this one is designed specially for St. Olaf community members.
+
+STUDENT ORGS
+Interested in finding something new to do on campus? Look no further, every official club is listed here.
diff --git a/fastlane/metadata/android/en-US/images/icon.png b/fastlane/metadata/android/en-US/images/icon.png
diff --git a/fastlane/metadata/android/en-US/short_description.txt b/fastlane/metadata/android/en-US/short_description.txt
@@ -0,0 +1 @@
+All About Olaf provides intuitive access to campus information and resources.
diff --git a/fastlane/metadata/android/en-US/title.txt b/fastlane/metadata/android/en-US/title.txt
@@ -0,0 +1 @@
+All About Olaf
diff --git a/fastlane/metadata/android/en-US/video.txt b/fastlane/metadata/android/en-US/video.txt
diff --git a/fastlane/metadata/en-US/release_notes.txt b/fastlane/metadata/en-US/release_notes.txt
@@ -7,7 +7,7 @@ NEW FEATURES
 • Solved the login issues for Balances!
   - You'll now stay logged in until your password changes.
   - We had to disable the Courses view, though.
-• Add a search bar to the Dictionary! (iOS only, sorry.)
+• Add a search bar to the Dictionary!
 
 BUG FIXES
 • Add an analytics opt-out switch
diff --git a/fastlane/platforms/agnostic.rb b/fastlane/platforms/agnostic.rb
@@ -28,6 +28,10 @@
   # update Android version
   set_gradle_version_name(version_name: version,
                           gradle_path: lane_context[:GRADLE_FILE])
+  
+  current_version_code = get_gradle_version_code(gradle_path: lane_context[:GRADLE_FILE])
+  set_gradle_version_code(version_code: current_version_code + 1,
+                          gradle_path: lane_context[:GRADLE_FILE])
 end
 
 desc 'Build the release notes: branch, commit hash, changelog'
@@ -47,3 +51,48 @@
 lane :bundle_data do
   sh('npm run bundle-data')
 end
+
+desc 'clone the match repo'
+private_lane :clone_match do
+  git_url = 'https://github.com/hawkrives/aao-keys'
+  dir = Dir.mktmpdir
+  command = "git clone --depth 1 '#{git_url}' '#{dir}'"
+
+  # this block pulled from https://github.com/fastlane/fastlane/blob/master/match/lib/match/git_helper.rb
+  UI.message 'Cloning remote git repo...'
+  begin
+    # GIT_TERMINAL_PROMPT will fail the `git clone` command if user credentials are missing
+    FastlaneCore::CommandExecutor.execute(command: "GIT_TERMINAL_PROMPT=0 #{command}",
+                                          print_all: true,
+                                          print_command: true)
+  rescue
+    UI.error 'Error cloning the certificates repo. Please make sure you have read access to the repository you want to use'
+    UI.error "Run the following command manually to make sure you're properly authenticated:"
+    UI.command command
+    UI.user_error! 'Error cloning the certificates git repo. Please make sure you have access to the repository - see instructions above'
+  end
+
+  dir
+end
+
+desc 'remove the match cloned folder'
+private_lane :remove_match_clone do |options|
+  UI.command "removing #{options[:dir]}"
+  FileUtils.remove_entry_secure options[:dir]
+end
+
+desc 'Set up the private keys + environment variables for local development'
+lane :keys do
+  match_dir = clone_match
+
+  # copy play-private-key.json
+  play_key = 'play-private-key.json'
+  UI.command "cp #{match_dir}/android/#{play_key} ../fastlane/#{play_key}"
+  FileUtils.cp("#{match_dir}/android/#{play_key}", "../fastlane/#{play_key}")
+
+  # copy .env.js
+  UI.command "cp #{match_dir}/js/env.js ../.env.js"
+  FileUtils.cp("#{match_dir}/js/env.js", "../.env.js")
+
+  remove_match_clone(dir: match_dir)
+end
diff --git a/fastlane/platforms/android.rb b/fastlane/platforms/android.rb
diff --git a/fastlane/platforms/ios.rb b/fastlane/platforms/ios.rb

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,8 @@ def self.available_options`
`47`	`47`	`FastlaneCore::ConfigItem.new(key: :gradle_path,`
`48`	`48`	`description: 'The path to the build.gradle file'),`
`49`	`49`	`FastlaneCore::ConfigItem.new(key: :version_code,`
`50`		`- description: 'The version to change to'),`
	`50`	`+ description: 'The version to change to',`
	`51`	`+ type: Integer),`
`51`	`52`	`]`
`52`	`53`	`end`
`53`	`54`