Merge pull request #1 from EranBoudjnah/version_2.0

Author: EranBoudjnah

.editorconfig

@@ -0,0 +1,17 @@
+root = true
+
+[*.{kt,kts}]
+end_of_line = lf
+ij_kotlin_allow_trailing_comma = false
+ij_kotlin_allow_trailing_comma_on_call_site = false
+ij_kotlin_imports_layout = *
+ij_kotlin_packages_to_use_import_on_demand = java.util.*, kotlinx.android.synthetic.**
+indent_size = 4
+indent_style = space
+insert_final_newline = true
+ktlint_code_style = android_studio
+ktlint_function_naming_ignore_when_annotated_with=Composable
+ktlint_function_signature_body_expression_wrapping = default
+ktlint_function_signature_rule_force_multiline_when_parameter_count_greater_or_equal_than = unset
+ktlint_ignore_back_ticked_identifier = false
+max_line_length = 100

.github/actions/cache-build-paths/action.yml

@@ -0,0 +1,19 @@
+name: 'Cache Build'
+description: 'Cache build paths'
+inputs:
+  key:
+    description: 'Cache key'
+    required: true
+runs:
+  using: 'composite'
+  steps:
+    - name: Cache build artifacts
+      uses: actions/cache@v3
+      with:
+        path: |
+          example/build
+          randomgenkt/build
+          randomgenkt.datasource/build
+        key: ${{ inputs.key }}
+        restore-keys: |
+          ${{ inputs.key }}

.github/workflows/gradle-checks.yml

@@ -0,0 +1,102 @@
+name: Android CI
+
+env:
+  cache-name: android-gradle
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+jobs:
+  setup:
+    runs-on: macos-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          java-version: '17'
+          distribution: 'adopt'
+          cache: gradle
+
+      - name: Cache build artifacts
+        uses: ./.github/actions/cache-build-paths
+        with:
+          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ github.sha }}
+
+      - name: Grant execute permission for gradlew
+        run: chmod +x gradlew
+
+      - name: Assemble with Gradle
+        run: ./gradlew jar --no-daemon
+
+  unit-tests:
+    needs: setup
+
+    runs-on: macos-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          java-version: '17'
+          distribution: 'adopt'
+          cache: gradle
+
+      - name: Cache build artifacts
+        uses: ./.github/actions/cache-build-paths
+        with:
+          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ github.sha }}
+
+      - name: Grant execute permission for gradlew
+        run: chmod +x gradlew
+
+      - name: Assemble
+        run: ./gradlew randomgenkt:assemble randomgenkt.datasource:assemble
+
+      - name: Publish to local maven
+        run: ./gradlew randomgenkt:publishToMavenLocal randomgenkt.datasource:publishToMavenLocal
+
+      - name: Run unit tests
+        run: ./gradlew test
+
+  lint:
+    needs: setup
+
+    runs-on: macos-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          java-version: '17'
+          distribution: 'adopt'
+          cache: gradle
+
+      - name: Cache build artifacts
+        uses: ./.github/actions/cache-build-paths
+        with:
+          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ github.sha }}
+
+      - name: Grant execute permission for gradlew
+        run: chmod +x gradlew
+
+      - name: Assemble
+        run: ./gradlew randomgenkt:assemble randomgenkt.datasource:assemble
+
+      - name: Publish to local maven
+        run: ./gradlew randomgenkt:publishToMavenLocal randomgenkt.datasource:publishToMavenLocal
+
+      - name: Run lint
+        run: ./gradlew lint --no-daemon

.github/workflows/ktlint.yml

@@ -0,0 +1,31 @@
+name: Kotlin-Linter
+
+on:
+  pull_request:
+
+jobs:
+  ktlint:
+    runs-on: macos-latest
+    steps:
+      - name: Get changed files
+        id: changes
+        run: |
+          URL="https://api.github.com/repos/${{ github.repository }}/pulls/${{ github.event.pull_request.number }}/files"
+          RESPONSE=$(curl -s -X GET -G $URL --header 'authorization: Bearer ${{ secrets.GITHUB_TOKEN }}')
+          CHANGED_KOTLIN_FILES=$(echo $RESPONSE | jq -r '.[] | .filename' | grep -E "\.kt$" | tr \'\\n\' ' ' | sed 's/^[ \t]*//;s/[ \t]*$//')
+          echo "Changed Kotlin files: ${CHANGED_KOTLIN_FILES}"
+          echo "changed_kotlin_files=${CHANGED_KOTLIN_FILES}" >> $GITHUB_ENV
+
+      - name: "checkout"
+        if: env.changed_kotlin_files != ''
+        uses: actions/checkout@v4
+
+      - name: Install ktlint
+        if: env.changed_kotlin_files != ''
+        run: |
+          curl -sSLO https://github.com/pinterest/ktlint/releases/download/1.0.1/ktlint && chmod a+x ktlint && sudo mv ktlint /usr/local/bin/
+
+      - name: run ktlint
+        if: env.changed_kotlin_files != ''
+        run: |
+          ktlint . '!**/build/**'

.travis.yml

@@ -5,7 +5,7 @@
 
 [![Version - RandomGenKt](https://img.shields.io/maven-central/v/com.mitteloupe.randomgenkt/randomgenkt?label=RandomGenKt+|+MavenCentral)](https://mvnrepository.com/artifact/com.mitteloupe.randomgenkt/randomgenkt)
 [![Version - DataSource](https://img.shields.io/maven-central/v/com.mitteloupe.randomgenkt/randomgenkt.datasource?label=datasource+|+MavenCentral)](https://mvnrepository.com/artifact/com.mitteloupe.randomgenkt/randomgenkt.datasource)
-[![Build Status](https://travis-ci.com/EranBoudjnah/RandomGenKt.svg?branch=master)](https://travis-ci.com/EranBoudjnah/RandomGenKt)
+![Build Status](https://img.shields.io/github/actions/workflow/status/EranBoudjnah/RandomGenKt/gradle-checks.yml)
 [![License](https://img.shields.io/github/license/EranBoudjnah/RandomGenKt)](https://github.com/EranBoudjnah/RandomGenKt/blob/master/LICENSE)
 
 ![Example](https://github.com/EranBoudjnah/RandomGenKt/raw/master/example/videocap.gif)
@@ -20,14 +20,14 @@ In your `build.gradle`, add the following:
 
 ```groovy
 dependencies {
-    implementation("com.mitteloupe.randomgenkt:randomgenkt:1.0.1")
+    implementation("com.mitteloupe.randomgenkt:randomgenkt:2.0.0")
 }
 ```
 
 To include the default data generators, also include
 ```groovy
 dependencies {
-    implementation("com.mitteloupe.randomgenkt:randomgenkt.datasource:1.0.1")
+    implementation("com.mitteloupe.randomgenkt:randomgenkt.datasource:2.0.0")
 }
 ```
 
@@ -36,7 +36,7 @@ dependencies {
 ### Kotlin
 ```kotlin
 val randomGen = RandomGen.Builder<ObjectClass>()
-	.ofClass<ObjectClass>()
+	.ofKotlinClass<ObjectClass>()
 	.withField("id")
 	.returningSequentialInteger()
 	.withField("uuid")
@@ -47,7 +47,7 @@ val randomGen = RandomGen.Builder<ObjectClass>()
 ### Java
 ```java
 RandomGen<ObjectClass> randomGen = new RandomGen.Builder<ObjectClass>()
-	.ofClass(ObjectClass.class)
+	.ofJavaClass(ObjectClass.class)
 	.withField("id")
 	.returningSequentialInteger()
 	.withField("uuid")
@@ -61,16 +61,22 @@ To use the newly generated `RandomGen`, simply call:
 
 ### Kotlin
 ```kotlin
-val instance = randomGen.generate()
+val instance = randomGen()
 ```
 
 ### Java
 ```java
-ObjectClass instance = randomGen.generate();
+ObjectClass instance = randomGen.invoke();
 ```
 
 ### What's New?
 
+Version 2.0
+
+This is an overhaul of RandomGenKt. It has been dusted, polished and refactored to align with modern conventions.
+
+--
+
 The Kotlin version adds the following:
 
 * Support for fields with lazy init

README.md

@@ -1,51 +1,21 @@
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+import org.gradle.api.tasks.testing.logging.TestExceptionFormat
+import org.gradle.api.tasks.testing.logging.TestLogEvent
 
 plugins {
-    kotlin("jvm") version "1.3.21"
-    id("com.github.ben-manes.versions") version "0.38.0"
+    id("com.android.application") version "8.1.2" apply false
+    kotlin("android") version "1.9.0" apply false
     id("io.codearte.nexus-staging") version "0.30.0"
+    id("com.google.dagger.hilt.android") version "2.48.1" apply false
 }
 
-buildscript {
-    repositories {
-        google()
-        jcenter()
-        mavenCentral()
-        maven(url = "https://plugins.gradle.org/m2/")
+tasks.withType(Test::class) {
+    testLogging {
+        exceptionFormat = TestExceptionFormat.FULL
+        events = setOf(
+            TestLogEvent.SKIPPED,
+            TestLogEvent.PASSED,
+            TestLogEvent.FAILED
+        )
+        showStandardStreams = true
     }
-    dependencies {
-        classpath("com.android.tools.build:gradle:4.1.3")
-        classpath(kotlin("gradle-plugin", version = "1.3.61"))
-        classpath("com.github.ben-manes:gradle-versions-plugin:0.38.0")
-        classpath("io.codearte.gradle.nexus:gradle-nexus-staging-plugin:0.30.0")
-        classpath("com.google.dagger:hilt-android-gradle-plugin:2.34-beta")
-    }
-}
-
-allprojects {
-    repositories {
-        google()
-        jcenter()
-        mavenCentral()
-    }
-}
-
-dependencies {
-    implementation(kotlin("stdlib-jdk8"))
-}
-
-val compileKotlin: KotlinCompile by tasks
-compileKotlin.kotlinOptions {
-    jvmTarget = "1.6"
-}
-
-val compileTestKotlin: KotlinCompile by tasks
-compileTestKotlin.kotlinOptions {
-    jvmTarget = "1.6"
 }
-
-val ktlintVerify: JavaExec by tasks.creating(JavaExec::class)
-
-val ktlintFormat: JavaExec by tasks.creating(JavaExec::class)
-
-