souyuz 0.9.1 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4338c8ba87321f5f72216ebc892cfb198e69b46a7bbe9fb987d0f7b481ad0925
-  data.tar.gz: edcecde20aa0c0a21907166013fa047d8c6601e94806ec744aeb373190747e65
+  metadata.gz: cfcbc75e52ece5af9c4eb049045525f607d7d3454189ad822727b6750185a659
+  data.tar.gz: 62b4b6f607e33b87b6253c67e96f55f39cdb0d0638ec05c2e27a7942543861a8
 SHA512:
-  metadata.gz: 2a68a6311b8293791e22ed5d68c5eec2c9e08dc73cef2973996ac80484425cf17c1549bb4381e89f4de0e605bafd9fa08a801f102e7fb5e22150dddb2b8e8a65
-  data.tar.gz: 2e4b0a2423213c5f694411ebc6165771ca9b0f964ee04f76f90983bf41ac1eff2da0f0fd422730260fe11cfb586c4039f4f285f0fa5e7f0eed9a256ff3e12119
+  metadata.gz: b445291e8406244c2f99e150fe402766111847ade4e32a308343bc5ffa120c0794d4e10ea57a083d43a27eceaa156942f54bd89f66aa009d06b5998d64b53507
+  data.tar.gz: eef32d0a9beb2f68852ddfefa0ef9c480067de86a57cd404a640297c2fb0b4c0561048f893b87b02aeb36ad325a8adcb9826fa0fa2873a4ac25ae4d39c871011

data/lib/souyuz/detect_values.rb

@@ -24,6 +24,7 @@ module Souyuz
 
       detect_output_path doc_csproj
       detect_manifest doc_csproj
+      detect_build_tools
       detect_info_plist
       detect_assembly_name doc_csproj # we can only do that for android *after* we detected the android manitfest
 
@@ -78,6 +79,20 @@ module Souyuz
       Souyuz.config[:manifest_path] = abs_project_path doc_node.text
     end
 
+    def self.detect_build_tools
+      return if Souyuz.config[:buildtools_path]
+
+      UI.user_error! "Please ensure that the Android SDK is installed and the ANDROID_HOME variable is set correctly" unless ENV['ANDROID_HOME']
+
+      # determine latest buildtool version
+      buildtools = File.join(ENV['ANDROID_HOME'], 'build-tools')
+      version = Dir.entries(buildtools).sort.last
+
+      UI.success "Using Buildtools Version: #{version}..."
+
+      Souyuz.config[:buildtools_path] = File.join(buildtools, version)
+    end
+
     def self.detect_info_plist
       return if Souyuz.config[:plist_path] or Souyuz.config[:platform] != Platform::IOS
 

data/lib/souyuz/generators/apk_sign_command_generator.rb

@@ -0,0 +1,47 @@
+module Souyuz
+  # Responsible for building the apksigner command
+  class ApkSignCommandGenerator
+    class << self
+      def generate
+        build_apk_path = Souyuz.cache[:build_apk_path]
+        Souyuz.cache[:signed_apk_path] = "#{build_apk_path}-unaligned"
+
+        parts = prefix
+        parts << detect_apksigner_executable
+        parts += options
+        parts << build_apk_path
+        parts += pipe
+
+        parts
+      end
+
+      def prefix
+        [""]
+      end
+
+      def detect_apksigner_executable
+        apksigner = File.join(Souyuz.config[:buildtools_path], 'apksigner')
+
+        apksigner
+      end
+
+      def options
+        options = []
+        options << "sign" if $verbose
+        options << "--verbose" if $verbose
+        options << "--ks \"#{Souyuz.config[:keystore_path]}\""
+        options << "--ks-pass \"#{Souyuz.config[:keystore_password]}\""
+        options << "--ks-key-alias \"#{Souyuz.config[:keystore_alias]}\""
+        options << "--out \"#{Souyuz.cache[:signed_apk_path]}\""
+
+        options
+      end
+
+      def pipe
+        pipe = []
+
+        pipe
+      end
+    end
+  end
+end

data/lib/souyuz/generators/{android_zipalign_command_generator.rb → zipalign_command_generator.rb}

@@ -1,6 +1,6 @@
 module Souyuz
   # Responsible for building the zipalign command
-  class AndroidZipalignCommandGenerator
+  class ZipalignCommandGenerator
     class << self
       def generate
         parts = prefix
@@ -13,21 +13,8 @@ module Souyuz
         parts
       end
 
-      def detect_build_tools
-        UI.user_error! "Please ensure that the Android SDK is installed and the ANDROID_HOME variable is set correctly" unless ENV['ANDROID_HOME']
-
-        # determine latest buildtool version
-        buildtools = File.join(ENV['ANDROID_HOME'], 'build-tools')
-        version = Dir.entries(buildtools).sort.last
-
-        UI.success "Using Buildtools Version: #{version}..."
-
-        [buildtools, version]
-      end
-
       def zipalign_apk
-        buildtools, version = detect_build_tools
-        zipalign = ENV['ANDROID_HOME'] ? File.join(buildtools, version, 'zipalign') : 'zipalign'
+        zipalign = File.join(Souyuz.config[:buildtools_path], 'zipalign')
 
         zipalign
       end

data/lib/souyuz/options.rb

@@ -58,6 +58,10 @@ module Souyuz
                                      env_name: "SOUYUZ_ANDROID_MANIFEST_PATH",
                                      description: "Path to the android manifest (xml) file",
                                      optional: true),
+        FastlaneCore::ConfigItem.new(key: :buildtools_path,
+                                     env_name: "SOUYUZ_ANDROID_BUILDTOOLS_PATH",
+                                     description: "Path to the android build tools",
+                                     optional: true),
         FastlaneCore::ConfigItem.new(key: :plist_path,
                                      env_name: "SOUYUZ_IOS_PLIST_PATH",
                                      description: "Path to the iOS plist file",
@@ -77,7 +81,7 @@ module Souyuz
         FastlaneCore::ConfigItem.new(key: :keystore_tsa,
                                      default_value: 'http://timestamp.digicert.com',
                                      env_name: "SOUYUZ_ANDROID_KEYSTORE_TSA",
-                                     description: "TSA for jarsigner",
+                                     description: "TSA for apksigner",
                                      optional: true)
       ]
     end

data/lib/souyuz/runner.rb

@@ -15,9 +15,7 @@ module Souyuz
       elsif Souyuz.project.android?
         path = apk_file
         if config[:keystore_path] && config[:keystore_alias]
-          UI.success "Jar it, sign it, zip it..."
-
-          jarsign_and_zipalign
+          apksign_and_zipalign
         end
 
         path
@@ -44,18 +42,20 @@ module Souyuz
       "#{build_path}/#{assembly_name}.apk"
     end
 
-    def jarsign_and_zipalign
-      command = JavaSignCommandGenerator.generate
+    def apksign_and_zipalign
+      UI.success "Start signing process..."
+
+      command = ZipalignCommandGenerator.generate
       FastlaneCore::CommandExecutor.execute(command: command,
-                                            print_all: false,
+                                            print_all: true,
                                             print_command: !Souyuz.config[:silent])
 
-      UI.success "Successfully signed apk #{Souyuz.cache[:build_apk_path]}"
-
-      command = AndroidZipalignCommandGenerator.generate
+      command = ApkSignCommandGenerator.generate
       FastlaneCore::CommandExecutor.execute(command: command,
-                                            print_all: true,
+                                            print_all: false,
                                             print_command: !Souyuz.config[:silent])
+
+      UI.success "Successfully signed apk #{Souyuz.cache[:build_apk_path]}"
     end
 
     #

data/lib/souyuz/version.rb

@@ -1,5 +1,5 @@
 
 module Souyuz
-  VERSION = "0.9.1"
+  VERSION = "0.10.0"
   DESCRIPTION = "A fastlane component to make Xamarin builds a breeze"
 end

data/lib/souyuz.rb

@@ -2,8 +2,8 @@ require 'souyuz/version'
 require 'souyuz/platform'
 require 'souyuz/manager'
 require 'souyuz/generators/build_command_generator'
-require 'souyuz/generators/android_zipalign_command_generator'
-require 'souyuz/generators/java_sign_command_generator'
+require 'souyuz/generators/zipalign_command_generator'
+require 'souyuz/generators/apk_sign_command_generator'
 require 'souyuz/generators/zip_dsym_command_generator'
 require 'souyuz/runner'
 require 'souyuz/options'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: souyuz
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.10.0
 platform: ruby
 authors:
 - Felix Rudat
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-02 00:00:00.000000000 Z
+date: 2021-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastlane
@@ -135,10 +135,10 @@ files:
 - lib/souyuz.rb
 - lib/souyuz/commands_generator.rb
 - lib/souyuz/detect_values.rb
-- lib/souyuz/generators/android_zipalign_command_generator.rb
+- lib/souyuz/generators/apk_sign_command_generator.rb
 - lib/souyuz/generators/build_command_generator.rb
-- lib/souyuz/generators/java_sign_command_generator.rb
 - lib/souyuz/generators/zip_dsym_command_generator.rb
+- lib/souyuz/generators/zipalign_command_generator.rb
 - lib/souyuz/manager.rb
 - lib/souyuz/msbuild/project.rb
 - lib/souyuz/msbuild/solution.rb

data/lib/souyuz/generators/java_sign_command_generator.rb

@@ -1,51 +0,0 @@
-module Souyuz
-  # Responsible for building the jarsigner command
-  class JavaSignCommandGenerator
-    class << self
-      def generate
-        build_apk_path = Souyuz.cache[:build_apk_path]
-        Souyuz.cache[:signed_apk_path] = "#{build_apk_path}-unaligned"
-
-        parts = prefix
-        parts << detect_jarsigner_executable
-        parts += options
-        parts << build_apk_path
-        parts << Souyuz.config[:keystore_alias]
-        parts += pipe
-
-        parts
-      end
-
-      def prefix
-        [""]
-      end
-
-      def detect_jarsigner_executable
-        jarsigner = ENV['JAVA_HOME'] ? File.join(ENV['JAVA_HOME'], 'bin', 'jarsigner') : 'jarsigner'
-
-        jarsigner
-      end
-
-      def options
-        config = Souyuz.config
-
-        options = []
-        options << "-verbose" if $verbose
-        options << "-sigalg MD5withRSA"
-        options << "-digestalg SHA1"
-        options << "-storepass \"#{config[:keystore_password]}\""
-        options << "-keystore \"#{config[:keystore_path]}\""
-        options << "-tsa #{config[:keystore_tsa]}"
-        options << "-signedjar \"#{Souyuz.cache[:signed_apk_path]}\""
-
-        options
-      end
-
-      def pipe
-        pipe = []
-
-        pipe
-      end
-    end
-  end
-end