souyuz 0.8.1 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df17b3536e569b94853ca253515178b8237baa39bb4b8caecee89ec309beb068
-  data.tar.gz: 1a49c072ced2b71497e51dd5b2393cf73632f0e122a171ee2de78e65e8a43018
+  metadata.gz: 8182d1d45cfe1912e724c4e7b57bbf5dc6619a77eea97cbe1a2e0e6586b6991a
+  data.tar.gz: da6ac32d2b8a6b53995af55e624b303ab739ff6790fa9dcc8591b040a7a5cae3
 SHA512:
-  metadata.gz: 2b7f8653ffab635f9a967cc88e7973af62081249a9a3c5f07d83d810ac91122ae2cd45fffca0f8fcc830902f6009968f339d035ab287395678080c94d65732b0
-  data.tar.gz: a1cb04c106f24ed6178b55bd3272d8516c9bba4af0e0903e52cc95c3fc32f47be8a5959dbc7dcab3b0057f8427a61917d8ce5b36232e0361cbaa9a299d8d8058
+  metadata.gz: d6f3a8b49153b55ca2cc1a89ba0a21ae3e69b23dabcca15d7e14c79adc7563cd712b8806b998d24896ab03f324b0180e18b4cc10ec05c7f194a0fa0e442a9102
+  data.tar.gz: ea0fdc1fba410eb7bae843fd57e141780976e0b4b923b0afed5feb00b03778003c9520c10ace969dbb27e7f8ebd41c7bb4af00b7e5a85ef408055eb511f6b808

data/README.md

@@ -1,7 +1,5 @@
 # Souyuz
 
-[![Build Status](https://travis-ci.org/voydz/souyuz.svg?branch=master)](https://travis-ci.org/voydz/souyuz)
-
 A fastlane component to make Xamarin builds a breeze. Souyuz is now avaialbe as an **Fastlane plugin** see [fastlane-plugin-souyuz](fastlane-plugin-souyuz) for details.
 
 *NOTE: While souyuz should continue working with your existing configuration just fine, consider using the Fastlane plugin.*

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}-signed"
+
+        parts = prefix
+        parts << detect_apksigner_executable
+        parts += options
+        parts << Souyuz.cache[:aligned_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/build_command_generator.rb

@@ -25,26 +25,26 @@ module Souyuz
         config = Souyuz.config
 
         options = []
-        options << "/p:Configuration=#{config[:build_configuration]}" if config[:build_configuration]
         options << config[:extra_build_options] if config[:extra_build_options]
-        options << "/p:Platform=#{config[:build_platform]}" if Souyuz.project.ios? and config[:build_platform]
-        options << "/p:BuildIpa=true" if Souyuz.project.ios?
+        options << "-p:Configuration=#{config[:build_configuration]}" if config[:build_configuration]
+        options << "-p:Platform=#{config[:build_platform]}" if Souyuz.project.ios? and config[:build_platform]
+        options << "-p:BuildIpa=true" if Souyuz.project.ios?
         if config[:solution_path]
           solution_dir = File.dirname(config[:solution_path])
-          options << "/p:SolutionDir=#{solution_dir}/"
+          options << "-p:SolutionDir=#{solution_dir}/"
         end
 
         options
       end
 
       def build_targets
-        Souyuz.config[:build_target].map! { |t| "/t:#{t}" }
+        Souyuz.config[:build_target].map! { |t| "-t:#{t}" }
       end
 
       def targets
         targets = []
         targets += build_targets
-        targets << "/t:SignAndroidPackage" if Souyuz.project.android?
+        targets << "-t:SignAndroidPackage" if Souyuz.project.android?
 
         targets
       end
@@ -52,8 +52,8 @@ module Souyuz
       def project
         path = []
 
-        path << Souyuz.config[:project_path] if Souyuz.project.android?
-        path << Souyuz.config[:solution_path] if Souyuz.project.ios? or Souyuz.project.osx?
+        path << Souyuz.config[:project_path] # if Souyuz.project.android?
+        # path << Souyuz.config[:solution_path] if Souyuz.project.ios? or Souyuz.project.osx?
 
         path
       end

data/lib/souyuz/generators/zipalign_command_generator.rb

@@ -0,0 +1,45 @@
+module Souyuz
+  # Responsible for building the zipalign command
+  class ZipalignCommandGenerator
+    class << self
+      def generate
+        build_apk_path = Souyuz.cache[:build_apk_path]
+        Souyuz.cache[:aligned_apk_path] = "#{build_apk_path}-aligned"
+
+        parts = prefix
+        parts << zipalign_apk
+        parts += options
+        parts << build_apk_path
+        parts << Souyuz.cache[:aligned_apk_path]
+        parts += pipe
+
+        parts
+      end
+
+      def zipalign_apk
+        zipalign = File.join(Souyuz.config[:buildtools_path], 'zipalign')
+
+        zipalign
+      end
+
+      def options
+        options = []
+        options << "-v" if $verbose
+        options << "-f"
+        options << "4"
+
+        options
+      end
+
+      def prefix
+        [""]
+      end
+
+      def pipe
+        pipe = []
+
+        pipe
+      end
+    end
+  end
+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.8.1"
+  VERSION = "0.10.1"
   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.8.1
+  version: 0.10.1
 platform: ruby
 authors:
 - Felix Rudat
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-15 00:00:00.000000000 Z
+date: 2021-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastlane
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.29.0
+        version: 1.103.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.29.0
+        version: 1.103.0
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
@@ -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
@@ -166,8 +166,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A fastlane component to make Xamarin builds a breeze

data/lib/souyuz/generators/android_zipalign_command_generator.rb

@@ -1,55 +0,0 @@
-module Souyuz
-  # Responsible for building the zipalign command
-  class AndroidZipalignCommandGenerator
-    class << self
-      def generate
-        parts = prefix
-        parts << zipalign_apk
-        parts += options
-        parts << Souyuz.cache[:signed_apk_path]
-        parts << Souyuz.cache[:build_apk_path]
-        parts += pipe
-
-        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
-      end
-
-      def options
-        options = []
-        options << "-v" if $verbose
-        options << "-f"
-        options << "4"
-
-        options
-      end
-
-      def prefix
-        [""]
-      end
-
-      def pipe
-        pipe = []
-
-        pipe
-      end
-    end
-  end
-end

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