Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ktlint #21

Open
wants to merge 8 commits into
base: sdk/dev
Choose a base branch
from
Open

ktlint #21

wants to merge 8 commits into from

Commits on Feb 10, 2023

  1. - Added ktlint 

    - applied ktlint formatting
    @nikhilAgarwalM
    nikhilAgarwalM committed Feb 10, 2023
    Configuration menu
    Copy the full SHA
    1e027b6 View commit details
    Browse the repository at this point in the history

  2. - Added ktlint 

    - applied ktlint formatting
    @nikhilAgarwalM
    nikhilAgarwalM committed Feb 10, 2023
    Configuration menu
    Copy the full SHA
    3b05868 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'sdk/dev' of https://github.com/media-net/prebid-mobile-… 

    …android into sdk/feature/ktlint

� Conflicts:
�	MediaNetAdSDK/src/main/java/com/medianet/android/adsdk/BannerAd.kt
�	MediaNetAdSDK/src/main/java/com/medianet/android/adsdk/MediaNetAdSDK.kt
�	MediaNetAdSDK/src/main/java/com/medianet/android/adsdk/events/EventFactory.kt
�	MediaNetAdSDK/src/main/java/com/medianet/android/adsdk/network/ConfigRepoImpl.kt
�	MediaNetAdSDK/src/main/java/com/medianet/android/adsdk/network/IConfigRepo.kt
�	MediaNetAdSDK/src/main/java/com/medianet/android/adsdk/rendering/banner/BannerAd.kt
�	MediaNetAdSDK/src/main/java/com/medianet/android/adsdk/utils/Util.kt
    @nikhilAgarwalM
    nikhilAgarwalM committed Feb 10, 2023
    Configuration menu
    Copy the full SHA
    633c291 View commit details
    Browse the repository at this point in the history

  4. - taking pull from dev

    @nikhilAgarwalM
    nikhilAgarwalM committed Feb 10, 2023
    Configuration menu
    Copy the full SHA
    e527eb3 View commit details
    Browse the repository at this point in the history

  5. Revert "- taking pull from dev" 

    This reverts commit e527eb3.
    @nikhilAgarwalM
    nikhilAgarwalM committed Feb 10, 2023
    Configuration menu
    Copy the full SHA
    b72d8a8 View commit details
    Browse the repository at this point in the history

  6. - imports formatting

    @nikhilAgarwalM
    nikhilAgarwalM committed Feb 10, 2023
    Configuration menu
    Copy the full SHA
    7950111 View commit details
    Browse the repository at this point in the history

Commits on Feb 20, 2023

  1. Merge branch 'sdk/dev' of https://github.com/media-net/prebid-mobile-… 

    …android into sdk/feature/ktlint

� Conflicts:
�	MediaNetAdSDK/src/main/java/com/medianet/android/adsdk/BannerAd.kt
�	MediaNetAdSDK/src/main/java/com/medianet/android/adsdk/GamEventListener.kt
�	MediaNetAdSDK/src/main/java/com/medianet/android/adsdk/InterstitialAd.kt
�	MediaNetAdSDK/src/main/java/com/medianet/android/adsdk/MAdViewUtils.kt
�	MediaNetAdSDK/src/main/java/com/medianet/android/adsdk/NativeAdListener.kt
�	MediaNetAdSDK/src/main/java/com/medianet/android/adsdk/events/EventManager.kt
�	MediaNetAdSDK/src/main/java/com/medianet/android/adsdk/nativead/NativeAd.kt
�	MediaNetAdSDK/src/main/java/com/medianet/android/adsdk/nativead/TitleAsset.kt
�	MediaNetAdSDK/src/main/java/com/medianet/android/adsdk/network/SDKConfigSyncWorker.kt
�	MediaNetAdSDK/src/main/java/com/medianet/android/adsdk/rendering/banner/BannerAd.kt
�	MediaNetAdSDK/src/main/java/com/medianet/android/adsdk/utils/Constants.kt
    @nikhilAgarwalM
    nikhilAgarwalM committed Feb 20, 2023
    Configuration menu
    Copy the full SHA
    1619bd0 View commit details
    Browse the repository at this point in the history

  2. - formatting

    @nikhilAgarwalM
    nikhilAgarwalM committed Feb 20, 2023
    Configuration menu
    Copy the full SHA
    803487b View commit details
    Browse the repository at this point in the history